[pisa-src] r1841 - in trunk/pairing: accept.c common.c common.h common_headers.h hash.c hash.h libconfig_wrapper.c libconfig_wrapper.h management.c packet_handler.c packet_handler.h passgen.c send.c
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 26 Nov 2009 19:15:51 +0100
Author: biurrun
Date: Thu Nov 26 19:15:51 2009
New Revision: 1841
Log:
header cleanup: #include all required headers directly, drop unused headers.
Modified:
trunk/pairing/accept.c
trunk/pairing/common.c
trunk/pairing/common.h
trunk/pairing/common_headers.h
trunk/pairing/hash.c
trunk/pairing/hash.h
trunk/pairing/libconfig_wrapper.c
trunk/pairing/libconfig_wrapper.h
trunk/pairing/management.c
trunk/pairing/packet_handler.c
trunk/pairing/packet_handler.h
trunk/pairing/passgen.c
trunk/pairing/send.c
Modified: trunk/pairing/accept.c
==============================================================================
--- trunk/pairing/accept.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/accept.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -13,11 +13,16 @@
#include <libconfig.h>
#include <signal.h>
+#include <stdio.h>
#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
#include <netinet/in.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include "libpisa/global.h"
#include "libpisa/hitlist.h"
+#include "common.h"
#include "common_headers.h"
#define TIMER_INTERVAL 60
Modified: trunk/pairing/common.c
==============================================================================
--- trunk/pairing/common.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/common.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -13,6 +13,9 @@
#define _XOPEN_SOURCE
+#include <assert.h>
+#include <ctype.h>
+#include <string.h>
#include <time.h>
#include "common.h"
Modified: trunk/pairing/common.h
==============================================================================
--- trunk/pairing/common.h Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/common.h Thu Nov 26 19:15:51 2009 (r1841)
@@ -14,12 +14,10 @@
#ifndef PISA_COMMON_H
#define PISA_COMMON_H
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <arpa/inet.h>
#include <stdio.h>
+#include <assert.h>
#include <sys/types.h>
+#include <sys/socket.h>
#include <time.h>
Modified: trunk/pairing/common_headers.h
==============================================================================
--- trunk/pairing/common_headers.h Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/common_headers.h Thu Nov 26 19:15:51 2009 (r1841)
@@ -15,9 +15,10 @@
#define PISA_COMMON_HEADERS_H
/* Contains header structures for information transmission */
+
+#include <stdint.h>
+#include <netinet/in.h>
#include "common.h"
-#include <stdlib.h>
-#include <time.h>
// If you add a new message type, update print_msg_info() in common_headers.c
#define MSG_PASSWORD 0
Modified: trunk/pairing/hash.c
==============================================================================
--- trunk/pairing/hash.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/hash.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -10,6 +10,10 @@
* @date Sep. 2008
*/
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <openssl/sha.h>
#include "hash.h"
Modified: trunk/pairing/hash.h
==============================================================================
--- trunk/pairing/hash.h Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/hash.h Thu Nov 26 19:15:51 2009 (r1841)
@@ -13,13 +13,6 @@
#ifndef PISA_HASH_H
#define PISA_HASH_H
-#include <stdio.h>
-#include <string.h>
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <assert.h>
-
-// Function prototypes
void get_sha(char *original, char *hash);
#endif /* PISA_HASH_H */
Modified: trunk/pairing/libconfig_wrapper.c
==============================================================================
--- trunk/pairing/libconfig_wrapper.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/libconfig_wrapper.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -11,6 +11,10 @@
* @date Sep. 2008
*/
+#include <libconfig.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
#include "libconfig_wrapper.h"
#include "libpisa/cfg.h"
#include "libpisa/hitlist.h"
Modified: trunk/pairing/libconfig_wrapper.h
==============================================================================
--- trunk/pairing/libconfig_wrapper.h Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/libconfig_wrapper.h Thu Nov 26 19:15:51 2009 (r1841)
@@ -14,8 +14,6 @@
#ifndef PISA_LIBCONFIG_WRAPPER_H
#define PISA_LIBCONFIG_WRAPPER_H
-// This is a wrapper for the libconfig configuration file reader
-#include "common.h"
#include <libconfig.h>
#include "libpisa/hitlist.h"
Modified: trunk/pairing/management.c
==============================================================================
--- trunk/pairing/management.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/management.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -10,24 +10,25 @@
* @date Aug. 2009
*/
+#include <assert.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <libconfig.h>
+#include <search.h>
+#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <time.h>
+#include <arpa/inet.h>
#include <netinet/in.h>
-#include <search.h>
-#include <signal.h>
-#include <getopt.h>
-#include <fcntl.h>
-#include <libconfig.h>
#include "libpisa/cfg.h"
#include "libpisa/debug.h"
#include "libpisa/global.h"
#include "common_headers.h"
#include "common.h"
-#include "libpisa/util.h"
#include "libconfig_wrapper.h"
-#include "libpisa/hitlist.h"
#define MAX_USERNAME_LENGTH 100
Modified: trunk/pairing/packet_handler.c
==============================================================================
--- trunk/pairing/packet_handler.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/packet_handler.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -10,14 +10,18 @@
* @date Sep. 2008
*/
+#include <assert.h>
#include <libconfig.h>
-#include <openssl/sha.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <time.h>
+#include <arpa/inet.h>
#include <netinet/in.h>
-#include "libpisa/hitlist.h"
+#include <openssl/sha.h>
+#include "libpisa/cfg.h"
#include "common.h"
-#include "common_headers.h"
+#include "hash.h"
#include "libconfig_wrapper.h"
#include "packet_handler.h"
Modified: trunk/pairing/packet_handler.h
==============================================================================
--- trunk/pairing/packet_handler.h Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/packet_handler.h Thu Nov 26 19:15:51 2009 (r1841)
@@ -13,6 +13,7 @@
#ifndef PISA_PACKET_HANDLER_H
#define PISA_PACKET_HANDLER_H
+#include <netinet/in.h>
#include "common_headers.h"
// Function prototypes
Modified: trunk/pairing/passgen.c
==============================================================================
--- trunk/pairing/passgen.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/passgen.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -11,10 +11,10 @@
*/
#include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
+#include <openssl/sha.h>
#include "hash.h"
-
/** This program generates the SHA1 hash of a password and stores it in a
file. Called as
*<pre>
* ./passgen <password> <filename>
Modified: trunk/pairing/send.c
==============================================================================
--- trunk/pairing/send.c Thu Nov 26 19:05:54 2009 (r1840)
+++ trunk/pairing/send.c Thu Nov 26 19:15:51 2009 (r1841)
@@ -10,6 +10,7 @@
* @date Sep. 2008
*/
+#include <assert.h>
#include <libconfig.h>
#include <stdio.h>
#include <stdlib.h>
@@ -19,11 +20,11 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
+
#include "libpisa/global.h"
#include "common_headers.h"
#include "common.h"
#include "packet_handler.h"
-#include "libconfig_wrapper.h"
// When these are updated, the user message in parse_options() should also be
updated
#define REQUEST_CONNECT 0
Other related posts:
- » [pisa-src] r1841 - in trunk/pairing: accept.c common.c common.h common_headers.h hash.c hash.h libconfig_wrapper.c libconfig_wrapper.h management.c packet_handler.c packet_handler.h passgen.c send.c - Diego Biurrun
