re-apply fixes lost with last rebase
This commit is contained in:
@@ -249,7 +249,7 @@ int et_hex2data(unsigned char * const data, const unsigned char * const hexstrin
|
||||
char *endptr = NULL;
|
||||
size_t count = 0;
|
||||
|
||||
fprintf(stdout, "%s(%s,%d)\n", __FUNCTION__, hexstring, len);
|
||||
fprintf(stdout, "%s(%s,%u)\n", __FUNCTION__, hexstring, len);
|
||||
|
||||
if ((len > 1) && (strlen((const char*)hexstring) % 2)) {
|
||||
//or hexstring has an odd length
|
||||
@@ -1103,7 +1103,7 @@ et_config_parse_opt_line (
|
||||
fprintf(stderr, "Please provide a valid -D/--delay-on-exit argument, %s is not a valid value\n", delay_on_exit);
|
||||
exit(1);
|
||||
}
|
||||
printf("Delay on exit is %d\n", delay_on_exit);
|
||||
printf("Delay on exit is %u\n", delay_on_exit);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@@ -398,7 +398,7 @@ typedef struct et_event_s {
|
||||
} u;
|
||||
} et_event_t;
|
||||
|
||||
inline void et_free_pointer(void *p) {if (NULL != p) {free(p); p=NULL;}};
|
||||
inline void et_free_pointer(void *p) {if (NULL != p) {free(p);}};
|
||||
|
||||
//-------------------------
|
||||
void et_free_packet(et_packet_t* packet);
|
||||
|
||||
@@ -54,7 +54,7 @@ void et_print_hex_octets(const unsigned char * const byte_stream, const unsigned
|
||||
fprintf(stdout, " |\n");
|
||||
}
|
||||
|
||||
fprintf(stdout, " %04ld |", octet_index);
|
||||
fprintf(stdout, " %04lu |", octet_index);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -94,7 +94,7 @@ void et_parse_s1ap(xmlDocPtr doc, const xmlNode const *s1ap_node, et_s1ap_t * co
|
||||
xml_char = xmlGetProp((xmlNode *)cur_node, (const xmlChar *)"value");
|
||||
if (NULL != xml_char) {
|
||||
xml_char2 = xmlGetProp((xmlNode *)cur_node, (const xmlChar *)"name");
|
||||
fprintf(stdout, "s1ap %p field name %s size %d value %s\n",s1ap, xml_char2, size, xml_char);
|
||||
fprintf(stdout, "s1ap %p field name %s size %u value %s\n",s1ap, xml_char2, size, xml_char);
|
||||
xmlFree(xml_char2);
|
||||
// if success to get value, do not parse children
|
||||
//AssertFatal ((xmlStrlen(xml_char) == size), "ERROR %s() mismatch in size %d and strlen %d\n", __FUNCTION__, size, xmlStrlen(xml_char));
|
||||
|
||||
Reference in New Issue
Block a user