net: A few changes in headres to follow c99

Since we're not system library

 - no underscopes in functions name until really needed
   and known to not clash with posix namespace
 - empty line between system headers and own headers
   for readability
 - extern for function prototypes
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

cr-dump.c

@@ -240,7 +240,7 @@ static int dump_one_fd(char *pid_fd_dir, int dir, char *fd_name, unsigned long p
 
 	fd = openat(dir, fd_name, O_RDONLY);
 	if (fd < 0) {
-		err = __try_dump_socket(pid_fd_dir, fd_name, cr_fdset);
+		err = try_dump_socket(pid_fd_dir, fd_name, cr_fdset);
 		if (err != 1)
 			return err;
 

include/libnetlink.h

-#ifndef __LINUX_RTNETLINK_H
-#define __LINUX_RTNETLINK_H
+#ifndef LIBNETLINK_H__
+#define LIBNETLINK_H__
 
 struct rtattr {
 	unsigned short  rta_len;
@@ -59,7 +59,7 @@ struct rtattr {
 
 #define NLMSG_MIN_TYPE          0x10    /* < 0x10: reserved control messages */
 
-int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
-int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *));
+extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+extern int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *));
 
-#endif
+#endif /* LIBNETLINK_H__ */

include/sockets.h

-#ifndef __CRTOOLS_SOCKETS_H__
-#define __CRTOOLS_SOCKETS_H__
-int collect_sockets(void);
+#ifndef CR_SOCKETS_H__
+#define CR_SOCKETS_H__
+
+#include <stdbool.h>
+
 struct cr_fdset;
-int __try_dump_socket(char *dir_name, char *fd_name, struct cr_fdset *cr_fdset);
-int prepare_sockets(int pid);
-void show_unixsk(char *name, int fd, bool show_header);
-#endif
+extern int try_dump_socket(char *dir_name, char *fd_name, struct cr_fdset *cr_fdset);
+
+extern int collect_sockets(void);
+extern int prepare_sockets(int pid);
+extern void show_unixsk(char *name, int fd, bool show_header);
+
+#endif /* CR_SOCKETS_H__ */

include/unix_diag.h

-#ifndef __UNIX_DIAG_H__
-#define __UNIX_DIAG_H__
+#ifndef UNIX_DIAG_H__
+#define UNIX_DIAG_H__
 
 #include "types.h"
 
@@ -44,4 +44,4 @@ struct unix_diag_vfs {
 	u32	udiag_vfs_dev;
 };
 
-#endif
+#endif /* UNIX_DIAG_H__ */

libnetlink.c

 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <string.h>
+
 #include "libnetlink.h"
 #include "util.h"
 

sockets.c

@@ -10,13 +10,15 @@
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <unistd.h>
+#include <limits.h>
+
 #include "types.h"
 #include "libnetlink.h"
 #include "sockets.h"
 #include "unix_diag.h"
-#include "util.h"
 #include "image.h"
 #include "crtools.h"
+#include "util.h"
 
 static char buf[4096];
 
@@ -170,7 +172,7 @@ err:
 	return -1;
 }
 
-int __try_dump_socket(char *dir, char *fd, struct cr_fdset *cr_fdset)
+int try_dump_socket(char *dir, char *fd, struct cr_fdset *cr_fdset)
 {
 	struct statfs fst;
 	struct stat st;