Added Added Removed

	* Makefile.am:
	* cpu.c:
	* fsusage.c:
	* glibtop_private.c: (get_scaled), (try_file_to_buffer),
	(file_to_buffer): Added
	* glibtop_private.h: Added
	* glibtop_server.c: Removed
	* glibtop_server.h:
	* loadavg.c:
	* mem.c:
	* netload.c:
	* open.c:
	* prockernel.c:
	* procmem.c:
	* procsegment.c:
	* procsignal.c:
	* procstate.c:
	* proctime.c:
	* procuid.c:
	* swap.c:
	* sysinfo.c:
	* uptime.c: Moved linux impl utils function from glibtop_server.* to
	glibtob_private.* because glibtop_server.h is a public header.

1 files changed, 0 insertions, 104 deletions

diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h
index bff9f775..38ac1d1f 100644
--- a/sysdeps/linux/glibtop_server.h
+++ b/sysdeps/linux/glibtop_server.h
@@ -24,108 +24,6 @@
 #ifndef __LINUX__GLIBTOP_SERVER_H__
 #define __LINUX__GLIBTOP_SERVER_H__
 
-#include <glibtop.h>
-
-#include <glib.h>
-
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-
-G_BEGIN_DECLS
-
-#ifdef _IN_LIBGTOP
-
-#define LINUX_VERSION_CODE(x,y,z)   (0x10000*(x) + 0x100*(y) + z)
-
-
-static inline char*
-next_token(const char *p)
-{
-	while (isspace(*p)) p++;
-	return (char*) p;
-}
-
-static inline char *
-skip_token (const char *p)
-{
-	p = next_token(p);
-	while (*p && !isspace(*p)) p++;
-	p = next_token(p);
-	return (char *)p;
-}
-
-static inline char *
-skip_multiple_token (const char *p, size_t count)
-{
-	while(count--)
-		p = skip_token (p);
-
-	return (char *)p;
-}
-
-
-static inline char *
-skip_line (const char *p)
-{
-	while (*p && *p != '\n') p++;
-	return (char *) (*p ? p+1 : p);
-}
-
-
-unsigned long long
-get_scaled(const char *buffer, const char *key);
-
-
-/* aborts on error */
-void
-file_to_buffer(glibtop *server, char *buffer, const char *filename);
-
-/* return < 0 on error, otherwise 0 on success */
-int
-try_file_to_buffer(char *buffer, const char *format, ...);
-
-
-/* some inline functions that wrap proc path
- * as fast as macros :)
- */
-
-static inline int
-proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid)
-{
-	return try_file_to_buffer(buffer, fmt, pid);
-}
-
-static inline int
-proc_stat_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/stat", pid);
-}
-
-static inline int
-proc_status_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/status", pid);
-}
-
-static inline int
-proc_statm_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/statm", pid);
-}
-
-
-static inline char *
-proc_stat_after_cmd (char *p)
-{
-	p = strrchr (p, ')');
-	if (G_LIKELY(p))
-		*p++ = '\0';
-	return p;
-}
-
-#endif
-
 #define GLIBTOP_SUID_CPU		0
 #define GLIBTOP_SUID_MEM		0
 #define GLIBTOP_SUID_SWAP		0
@@ -147,6 +45,4 @@ proc_stat_after_cmd (char *p)
 #define GLIBTOP_SUID_NETLOAD		0
 #define GLIBTOP_SUID_PPP		0
 
-G_END_DECLS
-
 #endif /* __LINUX__GLIBTOP_SERVER_H__ */