1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

capinfos: a couple of cleanups.

Browse Source 
The recno field of a pkt_cmt structure is set from a uint32_t; make it a
uint32_t, and use %u to format it.

Make print_stats_table_header_label() take printf-like arguments, rather
than having one of its call sites format into a buffer and passing that
to print_stats_table_header_label().
This commit is contained in:
Guy Harris 2025-06-02 14:39:29 -07:00
parent 599a88e900
commit 58fe0b7339
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
capinfos.c
View File

@ -175,7 +175,7 @@ typedef enum {
} order_t; } order_t;
typedef struct _pkt_cmt { typedef struct _pkt_cmt {
int recno; uint32_t recno;
char *cmt; char *cmt;
struct _pkt_cmt *next; struct _pkt_cmt *next;
} pkt_cmt; } pkt_cmt;
@ -633,9 +633,9 @@ print_stats(const char *filename, capture_info *cf_info)
if (pkt_comments && cf_info->pkt_cmts != NULL) { if (pkt_comments && cf_info->pkt_cmts != NULL) {
for (p = cf_info->pkt_cmts; p != NULL; prev = p, p = p->next, g_free(prev)) { for (p = cf_info->pkt_cmts; p != NULL; prev = p, p = p->next, g_free(prev)) {
if (machine_readable){ if (machine_readable){
printf("Packet %d Comment: %s\n", p->recno, g_strescape(p->cmt, NULL)); printf("Packet %u Comment: %s\n", p->recno, g_strescape(p->cmt, NULL));
} else { } else {
printf("Packet %d Comment: %s\n", p->recno, p->cmt); printf("Packet %u Comment: %s\n", p->recno, p->cmt);
} }
g_free(p->cmt); g_free(p->cmt);
} }
@ -680,12 +680,16 @@ putquote(void)
if (quote_char) putchar(quote_char); if (quote_char) putchar(quote_char);
} }
static void static void G_GNUC_PRINTF(1, 2)
print_stats_table_header_label(const char *label) print_stats_table_header_label(const char *fmt, ...)
{ {
va_list ap;
putsep(); putsep();
putquote(); putquote();
printf("%s", label); va_start(ap, fmt);
vprintf(fmt, ap);
va_end(ap);
putquote(); putquote();
} }
@ -729,17 +733,9 @@ print_stats_table_header(capture_info *cf_info)
if (cap_comment) print_stats_table_header_label("Capture comment"); if (cap_comment) print_stats_table_header_label("Capture comment");
if (pkt_comments && cf_info->pkt_cmts != NULL) { if (pkt_comments && cf_info->pkt_cmts != NULL) {
char *buf;
size_t buf_len;
/* Packet 2^64 Comment" + NULL */
buf_len = strlen("Packet 18446744073709551616 Comment") + 1;
buf = (char *)g_malloc0(buf_len);
for (p = cf_info->pkt_cmts; p != NULL; p = p->next) { for (p = cf_info->pkt_cmts; p != NULL; p = p->next) {
snprintf(buf, buf_len, "Packet %d Comment", p->recno); print_stats_table_header_label("Packet %u Comment", p->recno);
print_stats_table_header_label(buf);
} }
g_free(buf);
} }
printf("\n"); printf("\n");