oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct format specifiers

Browse Source
This commit is contained in:
Avinash Sonawane
2021-12-20 13:16:44 +05:30
committed by Robert Roth
parent f5ced2028d
commit 7e9fed1513
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/daemon/io.c
View File

@@ -27,7 +27,7 @@ void
do_output (int s, glibtop_response *resp, off_t offset, do_output (int s, glibtop_response *resp, off_t offset,
size_t data_size, const void *data) size_t data_size, const void *data)
{ {
glibtop_debug ("Really writing %d bytes at offset %lu.", glibtop_debug ("Really writing %zu bytes at offset %lu.",
sizeof (glibtop_response), offset); sizeof (glibtop_response), offset);
resp->offset = offset; resp->offset = offset;
@@ -42,7 +42,7 @@ do_output (int s, glibtop_response *resp, off_t offset,
} }
if (resp->data_size) { if (resp->data_size) {
glibtop_debug ("Writing %d bytes of data.", resp->data_size); glibtop_debug ("Writing %lu bytes of data.", resp->data_size);
if (s == 0) { if (s == 0) {
if (write (1, data, resp->data_size) < 0) if (write (1, data, resp->data_size) < 0)
@@ -84,7 +84,7 @@ do_read (int s, void *ptr, size_t total_size)
tmp_ptr += nread; tmp_ptr += nread;
ptr = tmp_ptr; ptr = tmp_ptr;
glibtop_debug ("READ (%d): %d - %d - %d", glibtop_debug ("READ (%d): %zu - %zu - %zu",
nread, already_read, remaining, total_size); nread, already_read, remaining, total_size);
} }

10
src/daemon/main.c
View File

@@ -49,7 +49,7 @@ handle_parent_connection (int s)
glibtop_server_features); glibtop_server_features);
if (enable_debug) if (enable_debug)
syslog_message (LOG_DEBUG, "SIZEOF: %u - %u - %u - %u - %u - %u", syslog_message (LOG_DEBUG, "SIZEOF: %zu - %zu - %zu - %zu - %zu - %zu",
sizeof (glibtop_command), sizeof (glibtop_response), sizeof (glibtop_command), sizeof (glibtop_response),
sizeof (glibtop_mountentry), sizeof (glibtop_union), sizeof (glibtop_mountentry), sizeof (glibtop_union),
sizeof (glibtop_sysdeps), sizeof (glibtop_sysdeps),
@@ -58,12 +58,12 @@ handle_parent_connection (int s)
while (do_read (s, cmnd, sizeof (glibtop_command))) { while (do_read (s, cmnd, sizeof (glibtop_command))) {
if (enable_debug) if (enable_debug)
syslog_message (LOG_DEBUG, syslog_message (LOG_DEBUG,
"Parent (%d) received command %llu from client.", "Parent (%d) received command %lu from client.",
getpid (), cmnd->command); getpid (), cmnd->command);
if (cmnd->data_size >= BUFSIZ) { if (cmnd->data_size >= BUFSIZ) {
syslog_message (LOG_WARNING, syslog_message (LOG_WARNING,
"Client sent %llu bytes, but buffer is %lu", "Client sent %lu bytes, but buffer is %lu",
cmnd->data_size, (unsigned long)BUFSIZ); cmnd->data_size, (unsigned long)BUFSIZ);
return; return;
} }
@@ -74,7 +74,7 @@ handle_parent_connection (int s)
if (cmnd->data_size) { if (cmnd->data_size) {
if (enable_debug) if (enable_debug)
syslog_message (LOG_DEBUG, "Client has %llu bytes of data.", syslog_message (LOG_DEBUG, "Client has %lu bytes of data.",
cmnd->data_size); cmnd->data_size);
do_read (s, parameter, cmnd->data_size); do_read (s, parameter, cmnd->data_size);
@@ -244,7 +244,7 @@ handle_parent_connection (int s)
0, NULL); 0, NULL);
break; break;
default: default:
syslog_message (LOG_ERR, "Parent received unknown command %llu.", syslog_message (LOG_ERR, "Parent received unknown command %lu.",
cmnd->command); cmnd->command);
break; break;
} }

8
src/daemon/slave.c
View File

@@ -42,10 +42,10 @@ handle_slave_connection (int input, int output)
while (do_read (input, cmnd, sizeof (glibtop_command))) { while (do_read (input, cmnd, sizeof (glibtop_command))) {
glibtop_debug ("Slave %d received command " glibtop_debug ("Slave %d received command "
"%llu from client.", getpid (), cmnd->command); "%lu from client.", getpid (), cmnd->command);
if (cmnd->data_size >= BUFSIZ) if (cmnd->data_size >= BUFSIZ)
glibtop_error ("Client sent %llu bytes, " glibtop_error ("Client sent %lu bytes, "
"but buffer is %lu", "but buffer is %lu",
cmnd->size, (unsigned long)BUFSIZ); cmnd->size, (unsigned long)BUFSIZ);
@@ -54,7 +54,7 @@ handle_slave_connection (int input, int output)
memset (parameter, 0, sizeof (parameter)); memset (parameter, 0, sizeof (parameter));
if (cmnd->data_size) { if (cmnd->data_size) {
glibtop_debug ("Client has %llu bytes of data.", glibtop_debug ("Client has %lu bytes of data.",
cmnd->data_size); cmnd->data_size);
do_read (input, parameter, cmnd->data_size); do_read (input, parameter, cmnd->data_size);
@@ -261,7 +261,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
break; break;
#endif #endif
default: default:
glibtop_error ("Child received unknown command %llu", glibtop_error ("Child received unknown command %lu",
cmnd->command); cmnd->command);
break; break;
} }