interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use PRI format strings in wire2str.c and remove ARG_LL.

This commit is contained in:
Jim Hague 2017-10-05 19:17:12 +01:00
parent 8a291d4dce
commit 0874a0a472
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1376,12 +1376,6 @@ AH_BOTTOM([
# include <winsock2.h> # include <winsock2.h>
# endif # endif
# ifndef USE_WINSOCK
# define ARG_LL "%ll"
# else
# define ARG_LL "%I64"
# endif
/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */ /* detect if we need to cast to unsigned int for FD_SET to avoid warnings */
# ifdef HAVE_WINSOCK2_H # ifdef HAVE_WINSOCK2_H
# define FD_SET_T (u_int) # define FD_SET_T (u_int)

15
src/gldns/wire2str.c
View File

@ -1059,11 +1059,7 @@ int gldns_wire2str_tsigtime_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
d4 = (*d)[4]; d4 = (*d)[4];
d5 = (*d)[5]; d5 = (*d)[5];
tsigtime = (d0<<40) | (d1<<32) | (d2<<24) | (d3<<16) | (d4<<8) | d5; tsigtime = (d0<<40) | (d1<<32) | (d2<<24) | (d3<<16) | (d4<<8) | d5;
#ifndef USE_WINSOCK w = gldns_str_print(s, sl, "%"PRIu64, (uint64_t)tsigtime);
w = gldns_str_print(s, sl, "%llu", (long long)tsigtime);
#else
w = gldns_str_print(s, sl, "%I64u", (long long)tsigtime);
#endif
(*d)+=6; (*d)+=6;
(*dl)-=6; (*dl)-=6;
return w; return w;
@ -1746,13 +1742,8 @@ int gldns_wire2str_edns_llq_print(char** s, size_t* sl, uint8_t* data,
if(error_code < llq_errors_num) if(error_code < llq_errors_num)
w += gldns_str_print(s, sl, " %s", llq_errors[error_code]); w += gldns_str_print(s, sl, " %s", llq_errors[error_code]);
else w += gldns_str_print(s, sl, " error %d", (int)error_code); else w += gldns_str_print(s, sl, " error %d", (int)error_code);
#ifndef USE_WINSOCK w += gldns_str_print(s, sl, " id %"PRIx64" lease-life %lu",
w += gldns_str_print(s, sl, " id %llx lease-life %lu", (uint64_t)llq_id, (unsigned long)lease_life);
(unsigned long long)llq_id, (unsigned long)lease_life);
#else
w += gldns_str_print(s, sl, " id %I64x lease-life %lu",
(unsigned long long)llq_id, (unsigned long)lease_life);
#endif
return w; return w;
} }