Skip to content

Commit b5081a5

Browse files
MelindaShoreMelindaShore
committed
Fixed Mac OS compilation errors/warnings
1 parent d6af1a4 commit b5081a5

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

‎context.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ int
106106
context_set_resolution_type(getdns_context *context, PyObject *py_value)
107107
{
108108
getdns_return_t ret;
109-
uint64_t value;
109+
getdns_resolution_t value;
110110

111111
if (!PyInt_Check(py_value)) {
112112
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
113113
return -1;
114114
}
115-
if ((long)(value = PyInt_AsLong(py_value)) < 0) {
115+
if ((long long)(value = (getdns_resolution_t)PyInt_AsLong(py_value)) < 0) {
116116
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
117117
return -1;
118118
}
@@ -134,13 +134,13 @@ int
134134
context_set_dns_transport(getdns_context *context, PyObject *py_value)
135135
{
136136
getdns_return_t ret;
137-
uint64_t value;
137+
getdns_transport_t value;
138138

139139
if (!PyInt_Check(py_value)) {
140140
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
141141
return -1;
142142
}
143-
if ((long)(value = PyInt_AsLong(py_value)) < 0) {
143+
if ((long long)(value = (getdns_transport_t)PyInt_AsLong(py_value)) < 0) {
144144
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
145145
return -1;
146146
}
@@ -296,7 +296,7 @@ context_set_dnssec_allowed_skew(getdns_context *context, PyObject *py_value)
296296
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
297297
return -1;
298298
}
299-
if ((long)(value = PyInt_AsLong(py_value)) < 0) {
299+
if ((long)(value = (uint32_t)PyInt_AsLong(py_value)) < 0) {
300300
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
301301
return -1;
302302
}
@@ -314,7 +314,7 @@ int
314314
context_set_edns_maximum_udp_payload_size(getdns_context *context, PyObject *py_value)
315315
{
316316
getdns_return_t ret;
317-
uint32_t value;
317+
uint16_t value;
318318

319319
if (!PyInt_Check(py_value)) {
320320
PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
@@ -937,21 +937,21 @@ context_general(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
937937
uint16_t request_type;
938938
PyDictObject *extensions_obj = 0;
939939
void *userarg;
940-
long tid = 0;
940+
getdns_transaction_t tid = 0;
941941
char *callback = 0;
942942
PyObject *resp;
943943

944944
if ((context = PyCapsule_GetPointer(self->py_context, "context")) == NULL) {
945945
PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);
946946
return NULL;
947947
}
948-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "sH|Osls", kwlist,
948+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "sH|OsLs", kwlist,
949949
&name, &request_type,
950950
&extensions_obj, &userarg, &tid, &callback)) {
951951
return NULL;
952952
}
953953
if ((resp = do_query(self->py_context, name, request_type, extensions_obj, userarg,
954-
(long)tid, callback)) == 0) {
954+
tid, callback)) == 0) {
955955
PyObject *err_type, *err_value, *err_traceback;
956956
PyErr_Fetch(&err_type, &err_value, &err_traceback);
957957
PyErr_Restore(err_type, err_value, err_traceback);
@@ -976,15 +976,15 @@ context_address(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
976976
char *name;
977977
PyDictObject *extensions_obj = 0;
978978
void *userarg;
979-
long tid;
979+
getdns_transaction_t tid;
980980
char *callback = 0;
981981
PyObject *resp;
982982

983983
if ((context = PyCapsule_GetPointer(self->py_context, "context")) == NULL) {
984984
PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);
985985
return NULL;
986986
}
987-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|OsHs", kwlist,
987+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|OsLs", kwlist,
988988
&name,
989989
&extensions_obj, &userarg, &tid, &callback)) {
990990
PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
@@ -1014,7 +1014,7 @@ context_hostname(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
10141014
void *address;
10151015
PyDictObject *extensions_obj = 0;
10161016
void *userarg;
1017-
long tid;
1017+
getdns_transaction_t tid;
10181018
char * callback = 0;
10191019
PyObject *resp;
10201020
getdns_context *context;
@@ -1023,7 +1023,7 @@ context_hostname(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
10231023
PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);
10241024
return NULL;
10251025
}
1026-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "O|Osls", kwlist,
1026+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "O|OsLs", kwlist,
10271027
&address,
10281028
&extensions_obj, &userarg, &tid, &callback)) {
10291029
PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
@@ -1054,7 +1054,7 @@ context_service(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
10541054
char *name;
10551055
PyDictObject *extensions_obj = 0;
10561056
void *userarg;
1057-
long tid;
1057+
getdns_transaction_t tid;
10581058
char *callback = 0;
10591059
PyObject *resp;
10601060
getdns_context *context;
@@ -1063,7 +1063,7 @@ context_service(getdns_ContextObject *self, PyObject *args, PyObject *keywds)
10631063
PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);
10641064
return NULL;
10651065
}
1066-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|Osls", kwlist,
1066+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|OsLs", kwlist,
10671067
&name,
10681068
&extensions_obj, &userarg, &tid, &callback)) {
10691069
PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);

‎getdns.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ callback_shim(getdns_context *context, getdns_callback_type_t type, getdns_dict
178178
/* Python callback prototype: */
179179
/* callback(context, callback_type, response, userarg, tid) */
180180
state = PyGILState_Ensure();
181-
PyObject_CallFunction(getdns_runner, "OHOsi", context, type, response,
182-
callback_data->userarg, (int)tid);
181+
PyObject_CallFunction(getdns_runner, "OHOsL", context, type, response,
182+
callback_data->userarg, tid);
183183
PyGILState_Release(state);
184184
}
185185

@@ -256,7 +256,7 @@ dispatch_query(PyObject *context_capsule,
256256
uint16_t request_type,
257257
PyDictObject *extensions_obj,
258258
void *userarg,
259-
int tid,
259+
getdns_transaction_t tid,
260260
char *callback)
261261

262262
{
@@ -396,7 +396,7 @@ do_query(PyObject *context_capsule,
396396
uint16_t request_type,
397397
PyDictObject *extensions_obj,
398398
void *userarg,
399-
long tid,
399+
getdns_transaction_t tid,
400400
char *callback)
401401

402402
{
@@ -456,9 +456,9 @@ cancel_callback(PyObject *self, PyObject *args, PyObject *keywds)
456456
PyObject *context_capsule;
457457
struct getdns_context *context;
458458
getdns_return_t ret;
459-
long tid;
459+
getdns_transaction_t tid;
460460

461-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "Ol", kwlist,
461+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "OL", kwlist,
462462
&context_capsule, &tid)) {
463463
return NULL;
464464
}
@@ -493,17 +493,17 @@ general(PyObject *self, PyObject *args, PyObject *keywds)
493493
uint16_t request_type;
494494
PyDictObject *extensions_obj = 0;
495495
void *userarg;
496-
long tid = 0;
496+
getdns_transaction_t tid = 0;
497497
char *callback = 0;
498498
PyObject *my_ret;
499499

500-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "OsH|Osls", kwlist,
500+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "OsH|OsLs", kwlist,
501501
&context_capsule, &name, &request_type,
502502
&extensions_obj, &userarg, &tid, &callback)) {
503503
return NULL;
504504
}
505505
if ((my_ret = do_query(context_capsule, name, request_type, extensions_obj, userarg,
506-
(long)tid, callback)) == 0) {
506+
tid, callback)) == 0) {
507507
PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);
508508
return NULL;
509509
}
@@ -527,7 +527,7 @@ service(PyObject *self, PyObject *args, PyObject *keywds)
527527
char *name;
528528
PyDictObject *extensions_obj = 0;
529529
void *userarg;
530-
long tid;
530+
getdns_transaction_t tid;
531531
char *callback = 0;
532532
PyObject *my_ret;
533533

@@ -564,11 +564,11 @@ address(PyObject *self, PyObject *args, PyObject *keywds)
564564
char *name;
565565
PyDictObject *extensions_obj = 0;
566566
void *userarg;
567-
long tid;
567+
getdns_transaction_t tid;
568568
char * callback = 0;
569569
PyObject *my_ret;
570570

571-
if (!PyArg_ParseTupleAndKeywords(args, keywds, "Os|OsHs", kwlist,
571+
if (!PyArg_ParseTupleAndKeywords(args, keywds, "Os|OsLs", kwlist,
572572
&context_capsule, &name,
573573
&extensions_obj, &userarg, &tid, &callback)) {
574574
PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
@@ -597,7 +597,7 @@ hostname(PyObject *self, PyObject *args, PyObject *keywds)
597597
void *address;
598598
PyDictObject *extensions_obj = 0;
599599
void *userarg;
600-
long tid;
600+
getdns_transaction_t tid;
601601
char * callback = 0;
602602
PyObject *my_ret;
603603

‎pygetdns.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ PyObject *context_hostname(getdns_ContextObject *self, PyObject *args, PyObject
110110
PyObject *context_service(getdns_ContextObject *self, PyObject *args, PyObject *keywds);
111111

112112
PyObject *do_query(PyObject *context_capsule, void *name, uint16_t request_type,
113-
PyDictObject *extensions_obj, void *userarg, long tid, char *callback);
113+
PyDictObject *extensions_obj, void *userarg, getdns_transaction_t tid, char *callback);
114114
PyObject *pythonify_address_list(getdns_list *list);
115115
PyObject *glist_to_plist(struct getdns_list *list);
116116
PyObject *gdict_to_pdict(struct getdns_dict *dict);
@@ -127,10 +127,6 @@ getdns_dict *getdnsify_addressdict(PyObject *pydict);
127127
void context_dealloc(getdns_ContextObject *self);
128128
void marshall_query(pygetdns_async_args_blob *blog);
129129
PyObject *dispatch_query(PyObject *context_capsule, void *name, uint16_t request_type,
130-
PyDictObject *extensions_obj, void *userarg, int tid, char *callback);
131-
#if 0
132-
PyObject *dispatch_query(PyObject *context_capsule, void *name, uint16_t request_type,
133-
PyDictObject *extensions_obj, void *userarg, long tid, char *callback);
134-
#endif
130+
PyDictObject *extensions_obj, void *userarg, getdns_transaction_t tid, char *callback);
135131

136132
#endif /* PYGETDNS_H */

‎pygetdns_util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ extensions_to_getdnsdict(PyDictObject *pydict)
143143
}
144144
optionslist = getdns_list_create();
145145

146-
optionlistsize = PyList_Size(opt_value);
146+
optionlistsize = (int)PyList_Size(opt_value);
147147

148148
for ( i = 0 ; i < optionlistsize ; i++) {
149149
tmpoptions_list_dict = getdns_dict_create();

0 commit comments

Comments
 (0)