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

Turned all macros to functions. Marked everything as G_GNUC_PRINTF and

Browse Source 
* 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:
Benoît Dejean
2004-12-23 21:50:41 +00:00
parent 71900c0e30
commit ce9ce223ca
6 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2004-12-23 Benoît Dejean <tazforever@dlfp.org>
* 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
2004-12-20 Benoît Dejean <tazforever@dlfp.org> 2004-12-20 Benoît Dejean <tazforever@dlfp.org>
* NEWS: * NEWS:

46
include/glibtop/error.h
View File

@@ -28,42 +28,20 @@
G_BEGIN_DECLS G_BEGIN_DECLS
void glibtop_error_vr (glibtop *server, char *format, va_list args); void glibtop_error_vr (glibtop *server, const char *format, va_list args);
void glibtop_warn_vr (glibtop *server, char *format, va_list args); void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args);
void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args); void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args); void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
void G_GNUC_UNUSED glibtop_error_r (glibtop *server, char *format, ...); void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2);
void G_GNUC_UNUSED glibtop_warn_r (glibtop *server, char *format, ...); void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
void G_GNUC_UNUSED glibtop_error_io_r (glibtop *server, char *format, ...); void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...); void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
#ifdef __GNUC__
#define glibtop_error(p1, args...) glibtop_error_r(glibtop_global_server , p1 , ## args)
#define glibtop_warn(p1, args...) glibtop_warn_r(glibtop_global_server , p1 , ## args)
#define glibtop_error_io(p1, args...) glibtop_error_io_r(glibtop_global_server , p1 , ## args)
#define glibtop_warn_io(p1, args...) glibtop_warn_io_r(glibtop_global_server , p1 , ## args)
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define glibtop_error(p1, ...) glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__)
#define glibtop_warn(p1, ...) glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__)
#define glibtop_error_io(p1, ...) glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__)
#define glibtop_warn_io(p1, ...) glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__)
#else /* no __GNUC__, no C99*/
void glibtop_error (char *format, ...);
void glibtop_warn (char *format, ...);
void glibtop_error_io (char *format, ...);
void glibtop_warn_io (char *format, ...);
#endif /* no __GNUC__ */
G_END_DECLS G_END_DECLS

6
lib/parameter.c
View File

@@ -32,9 +32,9 @@
#define _check_data(size) \ #define _check_data(size) \
if ((data_ptr == NULL) || (data_size != 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.", \ "Expected %lu bytes but got %lu.", \
parameter, size, data_size); \ (unsigned) parameter, (unsigned long) size, (unsigned long) data_size); \
return; \ return; \
} }
@@ -82,7 +82,7 @@ glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
break; break;
case GLIBTOP_PARAM_FEATURES: case GLIBTOP_PARAM_FEATURES:
/* You should not be allowed to set this field. */ /* 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.", "Cannot modify read-only value.",
parameter); parameter);
break; break;

10
lib/read_data.c
View File

@@ -38,7 +38,8 @@ glibtop_read_data_l (glibtop *server)
glibtop_init_r (&server, 0, 0); glibtop_init_r (&server, 0, 0);
#ifdef DEBUG #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 #endif
if (server->socket) { if (server->socket) {
@@ -51,7 +52,8 @@ glibtop_read_data_l (glibtop *server)
glibtop_error_io_r (server, _("read data size")); glibtop_error_io_r (server, _("read data size"));
#ifdef DEBUG #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 #endif
if (!size) return NULL; if (!size) return NULL;
@@ -65,7 +67,9 @@ glibtop_read_data_l (glibtop *server)
} }
if (ret < 0) 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; return ptr;
} }

43
sysdeps/common/error.c
View File

@@ -30,17 +30,17 @@
static void static void
print_server_name (const glibtop *server) print_server_name (const glibtop *server)
{ {
fprintf (stderr, "%s: ", server ? fprintf (stderr, "%s: ", server && server->name
(server->name ? server->name : DEFAULT_NAME) ? server->name
: DEFAULT_NAME); : DEFAULT_NAME);
} }
void void
glibtop_error_vr (glibtop *server, char *format, va_list args) glibtop_error_vr (glibtop *server, const char *format, va_list args)
{ {
print_server_name (server); print_server_name (server);
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
fprintf (stderr, "\n"); fputc('\n', stderr);
#ifdef LIBGTOP_ENABLE_DEBUG #ifdef LIBGTOP_ENABLE_DEBUG
abort (); abort ();
@@ -50,7 +50,7 @@ glibtop_error_vr (glibtop *server, char *format, va_list args)
} }
void void
glibtop_error_io_vr (glibtop *server, char *format, int error, va_list args) glibtop_error_io_vr (glibtop *server, const char *format, int error, va_list args)
{ {
print_server_name (server); print_server_name (server);
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
@@ -64,11 +64,11 @@ glibtop_error_io_vr (glibtop *server, char *format, int error, va_list args)
} }
void void
glibtop_warn_vr (glibtop *server, char *format, va_list args) glibtop_warn_vr (glibtop *server, const char *format, va_list args)
{ {
print_server_name (server); print_server_name (server);
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
fprintf (stderr, "\n"); fputc('\n', stderr);
#ifdef LIBGTOP_FATAL_WARNINGS #ifdef LIBGTOP_FATAL_WARNINGS
abort (); abort ();
@@ -76,7 +76,7 @@ glibtop_warn_vr (glibtop *server, char *format, va_list args)
} }
void void
glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args) glibtop_warn_io_vr (glibtop *server, const char *format, int error, va_list args)
{ {
print_server_name (server); print_server_name (server);
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
@@ -88,8 +88,8 @@ glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
} }
void G_GNUC_UNUSED void
glibtop_error_r (glibtop *server, char *format, ...) glibtop_error_r (glibtop *server, const char *format, ...)
{ {
va_list args; va_list args;
@@ -99,8 +99,8 @@ glibtop_error_r (glibtop *server, char *format, ...)
} }
void G_GNUC_UNUSED void
glibtop_warn_r (glibtop *server, char *format, ...) glibtop_warn_r (glibtop *server, const char *format, ...)
{ {
va_list args; va_list args;
@@ -109,8 +109,8 @@ glibtop_warn_r (glibtop *server, char *format, ...)
va_end (args); va_end (args);
} }
void G_GNUC_UNUSED void
glibtop_error_io_r (glibtop *server, char *format, ...) glibtop_error_io_r (glibtop *server, const char *format, ...)
{ {
va_list args; va_list args;
@@ -119,8 +119,8 @@ glibtop_error_io_r (glibtop *server, char *format, ...)
va_end (args); va_end (args);
} }
void G_GNUC_UNUSED void
glibtop_warn_io_r (glibtop *server, char *format, ...) glibtop_warn_io_r (glibtop *server, const char *format, ...)
{ {
va_list args; va_list args;
@@ -129,10 +129,9 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
va_end (args); va_end (args);
} }
#ifndef __GNUC__
void void
glibtop_error (char *format, ...) glibtop_error (const char *format, ...)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
@@ -141,7 +140,7 @@ glibtop_error (char *format, ...)
} }
void void
glibtop_warn (char *format, ...) glibtop_warn (const char *format, ...)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
@@ -150,7 +149,7 @@ glibtop_warn (char *format, ...)
} }
void void
glibtop_error_io (char *format, ...) glibtop_error_io (const char *format, ...)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
@@ -159,12 +158,10 @@ glibtop_error_io (char *format, ...)
} }
void void
glibtop_warn_io (char *format, ...) glibtop_warn_io (const char *format, ...)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
glibtop_warn_io_vr (glibtop_global_server, format, errno, args); glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
va_end (args); va_end (args);
} }
#endif /* __GNUC__ */

7
sysdeps/common/fsusage.c
View File

@@ -126,9 +126,10 @@ static const unsigned long _glibtop_sysdeps_fsusage =
*/ */
#ifdef linux #ifdef linux
void _glibtop_linux_get_fsusage_read_write(glibtop *server, void G_GNUC_INTERNAL
glibtop_fsusage *buf, _glibtop_linux_get_fsusage_read_write(glibtop *server,
const char *path); glibtop_fsusage *buf,
const char *path);
#define _glibtop_get_fsusage_read_write(S, B, P) \ #define _glibtop_get_fsusage_read_write(S, B, P) \
_glibtop_linux_get_fsusage_read_write(S, B, P) _glibtop_linux_get_fsusage_read_write(S, B, P)