diff options
author | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 12:48:30 +0000 |
---|---|---|
committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 21:02:47 +0000 |
commit | dabc6958b35c325a727520f3e68d67bf03c31d61 (patch) | |
tree | 4b1caffa9b41c909dcc7764f81321106dadfa955 | |
parent | f41740ec89477d066376d6e60aaf6f849237d454 (diff) | |
download | gnunet-dabc6958b35c325a727520f3e68d67bf03c31d61.tar.gz gnunet-dabc6958b35c325a727520f3e68d67bf03c31d61.zip |
W32: Fix wrong format strings
-rw-r--r-- | src/gns/gnunet-gns-helper-service-w32.c | 6 | ||||
-rw-r--r-- | src/util/os_priority.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index 8a047c9fd..33de2aab6 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -473,7 +473,7 @@ process_lookup_result (void *cls, | |||
473 | if ((char *) ptr - (char *) msg != size || size_recalc != size || size_recalc != ((char *) ptr - (char *) msg)) | 473 | if ((char *) ptr - (char *) msg != size || size_recalc != size || size_recalc != ((char *) ptr - (char *) msg)) |
474 | { | 474 | { |
475 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 475 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
476 | "Error in WSAQUERYSETW size calc: expected %lu, got %lu (recalc %lu)\n", | 476 | "Error in WSAQUERYSETW size calc: expected %u, got %lu (recalc %u)\n", |
477 | size, | 477 | size, |
478 | (unsigned long) ((char *) ptr - (char *) msg), | 478 | (unsigned long) ((char *) ptr - (char *) msg), |
479 | size_recalc); | 479 | size_recalc); |
@@ -528,7 +528,7 @@ get_ip_from_hostname (struct GNUNET_SERVICE_Client *client, | |||
528 | else | 528 | else |
529 | { | 529 | { |
530 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 530 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
531 | "Unknown GUID: %08X-%04X-%04X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", | 531 | "Unknown GUID: %08lX-%04X-%04X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", |
532 | sc.Data1, | 532 | sc.Data1, |
533 | sc.Data2, | 533 | sc.Data2, |
534 | sc.Data3, | 534 | sc.Data3, |
@@ -674,7 +674,7 @@ handle_get (void *cls, | |||
674 | for (int i = 0; i < 8; i++) | 674 | for (int i = 0; i < 8; i++) |
675 | sc.Data4[i] = msg->sc_data4[i]; | 675 | sc.Data4[i] = msg->sc_data4[i]; |
676 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 676 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
677 | "Got GUID: %08X-%04X-%04X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", | 677 | "Got GUID: %08lX-%04X-%04X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", |
678 | sc.Data1, | 678 | sc.Data1, |
679 | sc.Data2, | 679 | sc.Data2, |
680 | sc.Data3, | 680 | sc.Data3, |
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 6888f9b83..b33539742 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -1229,7 +1229,7 @@ start_process (int pipe_control, | |||
1229 | if (sizeof (count) != wrote) | 1229 | if (sizeof (count) != wrote) |
1230 | { | 1230 | { |
1231 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1231 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1232 | "Failed to write %u count bytes to the child: %u\n", | 1232 | "Failed to write %u count bytes to the child: %lu\n", |
1233 | sizeof (count), GetLastError ()); | 1233 | sizeof (count), GetLastError ()); |
1234 | break; | 1234 | break; |
1235 | } | 1235 | } |
@@ -1240,7 +1240,7 @@ start_process (int pipe_control, | |||
1240 | if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi)) | 1240 | if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi)) |
1241 | { | 1241 | { |
1242 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1242 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1243 | "Failed to duplicate an socket[%llu]: %u\n", i, | 1243 | "Failed to duplicate an socket[%u]: %lu\n", i, |
1244 | GetLastError ()); | 1244 | GetLastError ()); |
1245 | break; | 1245 | break; |
1246 | } | 1246 | } |
@@ -1257,7 +1257,7 @@ start_process (int pipe_control, | |||
1257 | if (sizeof (size) != wrote) | 1257 | if (sizeof (size) != wrote) |
1258 | { | 1258 | { |
1259 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1259 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1260 | "Failed to write %u size[%llu] bytes to the child: %u\n", | 1260 | "Failed to write %u size[%u] bytes to the child: %lu\n", |
1261 | sizeof (size), i, GetLastError ()); | 1261 | sizeof (size), i, GetLastError ()); |
1262 | break; | 1262 | break; |
1263 | } | 1263 | } |
@@ -1266,7 +1266,7 @@ start_process (int pipe_control, | |||
1266 | if (sizeof (pi) != wrote) | 1266 | if (sizeof (pi) != wrote) |
1267 | { | 1267 | { |
1268 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1268 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1269 | "Failed to write %u socket[%llu] bytes to the child: %u\n", | 1269 | "Failed to write %u socket[%u] bytes to the child: %lu\n", |
1270 | sizeof (pi), i, GetLastError ()); | 1270 | sizeof (pi), i, GetLastError ()); |
1271 | break; | 1271 | break; |
1272 | } | 1272 | } |