version 2.6.1

* configure.in: version 2.6.1

sysdeps/linux/glibtop_server.h

@@ -21,16 +21,12 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __LINUX__GLIBTOP_SERVER_H__
-#define __LINUX__GLIBTOP_SERVER_H__
+#ifndef __GLIBTOP_SERVER_H__
+#define __GLIBTOP_SERVER_H__
 
-#include <glibtop.h>
-
-#include <glib.h>
 
 #include <fcntl.h>
 #include <ctype.h>
-#include <string.h>
 
 G_BEGIN_DECLS
 
@@ -38,10 +34,6 @@ G_BEGIN_DECLS
 
 #define LINUX_VERSION(x,y,z)   (0x10000*(x) + 0x100*(y) + z)
 
-
-unsigned get_pageshift();
-
-
 static inline char *
 skip_token (const char *p)
 {
@@ -59,7 +51,6 @@ skip_multiple_token (const char *p, size_t count)
 	return (char *)p;
 }
 
-
 static inline char *
 skip_line (const char *p)
 {
@@ -67,29 +58,12 @@ skip_line (const char *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);
-}
+proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid);
 
 static inline int
 proc_stat_to_buffer (char *buffer, pid_t pid)
@@ -109,13 +83,13 @@ 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';
+	if (!p) return p;
+
+	*p++ = '\0';
 	return p;
 }
 
@@ -144,4 +118,4 @@ proc_stat_after_cmd (char *p)
 
 G_END_DECLS
 
-#endif /* __LINUX__GLIBTOP_SERVER_H__ */
+#endif