Turned all macros to functions. Marked everything as G_GNUC_PRINTF and
* include/glibtop/error.h: * lib/parameter.c: (glibtop_set_parameter_l): * lib/read_data.c: (glibtop_read_data_l): * sysdeps/common/error.c: (print_server_name), (glibtop_error_vr), (glibtop_error_io_vr), (glibtop_warn_vr), (glibtop_warn_io_vr), (glibtop_error_r), (glibtop_warn_r), (glibtop_error_io_r), (glibtop_warn_io_r), (glibtop_error), (glibtop_warn), (glibtop_error_io), (glibtop_warn_io): Turned all macros to functions. Marked everything as G_GNUC_PRINTF and fixed format bugs. * sysdeps/common/fsusage.c: Marked some functions as G_GNUC_INTERNAL
This commit is contained in:
+3
-3
@@ -32,9 +32,9 @@
|
||||
|
||||
#define _check_data(size) \
|
||||
if ((data_ptr == NULL) || (data_size != size)) { \
|
||||
glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
|
||||
glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
|
||||
"Expected %lu bytes but got %lu.", \
|
||||
parameter, size, data_size); \
|
||||
(unsigned) parameter, (unsigned long) size, (unsigned long) data_size); \
|
||||
return; \
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
|
||||
break;
|
||||
case GLIBTOP_PARAM_FEATURES:
|
||||
/* You should not be allowed to set this field. */
|
||||
glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
|
||||
glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
|
||||
"Cannot modify read-only value.",
|
||||
parameter);
|
||||
break;
|
||||
|
||||
+7
-3
@@ -38,7 +38,8 @@ glibtop_read_data_l (glibtop *server)
|
||||
glibtop_init_r (&server, 0, 0);
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
|
||||
fprintf (stderr, "LIBRARY: reading %lu data bytes.\n",
|
||||
(unsigned long) sizeof (size_t));
|
||||
#endif
|
||||
|
||||
if (server->socket) {
|
||||
@@ -51,7 +52,8 @@ glibtop_read_data_l (glibtop *server)
|
||||
glibtop_error_io_r (server, _("read data size"));
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
|
||||
fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n",
|
||||
(unsigned long) size, ret);
|
||||
#endif
|
||||
|
||||
if (!size) return NULL;
|
||||
@@ -65,7 +67,9 @@ glibtop_read_data_l (glibtop *server)
|
||||
}
|
||||
|
||||
if (ret < 0)
|
||||
glibtop_error_io_r (server, ngettext ("read data %d byte", "read data %d bytes", size));
|
||||
glibtop_error_io_r (server,
|
||||
ngettext ("read data %lu byte", "read data %lu bytes",
|
||||
(unsigned long) size));
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user