From 10d56bd5fcb34689b1c91fe8153356219f8ffa2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Sat, 12 Jun 2004 12:05:49 +0000 Subject: Added to repository. * Makefile.am: * glibtop_server.c: Added to repository. * glibtop_server.h: (get_scaled): Uninlined and moved it to glibtop_server.c. (skip_token) : Fixed indentation. * procmap.c: (glibtop_get_proc_map_s): Big cleanup. Better allocation algorithm. * procmem.c: * procsegment.c: Added missing initializations. * sem_limits.c: * shm_limits.c: (glibtop_get_shm_limits_s): * swap.c: * uptime.c: Added missing const qualifiers. * sysinfo.c: (init_sysinfo): Added missing 0 initialization. Saved 1 gboolean :D. --- sysdeps/linux/glibtop_server.h | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'sysdeps/linux/glibtop_server.h') diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h index e99af495..b1f3d7d6 100644 --- a/sysdeps/linux/glibtop_server.h +++ b/sysdeps/linux/glibtop_server.h @@ -24,6 +24,7 @@ #ifndef __GLIBTOP_SERVER_H__ #define __GLIBTOP_SERVER_H__ + #include #include @@ -36,8 +37,8 @@ G_BEGIN_DECLS static inline char * skip_token (const char *p) { - while (isspace(*p)) p++; - while (*p && !isspace(*p)) p++; + while (isspace(*p)) p++; + while (*p && !isspace(*p)) p++; return (char *)p; } @@ -57,25 +58,9 @@ skip_line (const char *p) return (char *) (*p ? p+1 : p); } -static inline unsigned long long -get_scaled(const char *buffer, const char *key) -{ - const char *ptr; - char *next; - const size_t len = strlen(key); - unsigned long long value = 0; - - if ((ptr = strstr(buffer, key))) - { - ptr += len; - value = strtoull(ptr, &next, 0); - if (strchr(next, 'k')) - value *= 1024; - else if (strchr(next, 'M')) - value *= 1024 * 1024; - } - return value; -} +unsigned long long +get_scaled(const char *buffer, const char *key); + static inline int proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid) -- cgit v1.2.1