[Git][NTPsec/ntpsec][master] Clean up headers included multiple times.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
c715d3bb by Matt Selsky at 2016-07-15T08:42:39-04:00
Clean up headers included multiple times.

Found with assistance from http://www.catb.org/esr/deheader/

- - - - -


12 changed files:

- libparse/clk_meinberg.c
- ntpd/ntp_intercept.c
- ntpd/ntp_proto.c
- ntpd/refclock_neoclock.c
- ntpq/ntpq.c
- tests/libntp/a_md5encrypt.c
- tests/libntp/authkeys.c
- tests/libntp/calyearstart.c
- tests/libntp/ssl_init.c
- tests/libntp/tstotv.c
- tests/libntp/tvtots.c
- tests/unity/unity_fixture.c


Changes:

=====================================
libparse/clk_meinberg.c
=====================================
--- a/libparse/clk_meinberg.c
+++ b/libparse/clk_meinberg.c
@@ -19,8 +19,6 @@
 
 #include "ntp_stdlib.h"
 
-#include "ntp_stdlib.h"
-
 #include "mbg_gps166.h"
 #include "binio.h"
 #include "ascii.h"


=====================================
ntpd/ntp_intercept.c
=====================================
--- a/ntpd/ntp_intercept.c
+++ b/ntpd/ntp_intercept.c
@@ -96,7 +96,6 @@ Reference-clock events are not yet intercepted.
 #include "ntp_io.h"
 #include "ntp_control.h"
 #include "ntp_unixtime.h"
-#include "ntp_stdlib.h"
 #include "ntp_config.h"
 #include "ntp_crypto.h"
 #include "ntp_assert.h"


=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -20,7 +20,6 @@
 #include <libscf.h>
 #endif
 #include <unistd.h>
-#include <stdio.h>
 
 /*
  * This macro defines the authentication state. If x is 1 authentication


=====================================
ntpd/refclock_neoclock.c
=====================================
--- a/ntpd/refclock_neoclock.c
+++ b/ntpd/refclock_neoclock.c
@@ -25,8 +25,6 @@
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
-#include <termios.h>
-
 #define NAME		"NEOCLOCK"
 #define DESCRIPTION	"NeoClock4X"
 


=====================================
ntpq/ntpq.c
=====================================
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -22,7 +22,6 @@
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"
-#include "ntp_assert.h"
 #include "lib_strbuf.h"
 #include "ntp_lineedit.h"
 #include "ntp_debug.h"


=====================================
tests/libntp/a_md5encrypt.c
=====================================
--- a/tests/libntp/a_md5encrypt.c
+++ b/tests/libntp/a_md5encrypt.c
@@ -17,7 +17,6 @@ TEST_TEAR_DOWN(a_md5encrypt) {}
 # include "openssl/evp.h"
 #endif
 #include "ntp.h"
-#include "ntp_stdlib.h"
 
 /*
  * Example packet with MD5 hash calculated manually.


=====================================
tests/libntp/authkeys.c
=====================================
--- a/tests/libntp/authkeys.c
+++ b/tests/libntp/authkeys.c
@@ -11,7 +11,6 @@
 # include "openssl/evp.h"
 #endif
 #include "ntp.h"
-#include "ntp_stdlib.h"
 
 TEST_GROUP(authkeys);
 


=====================================
tests/libntp/calyearstart.c
=====================================
--- a/tests/libntp/calyearstart.c
+++ b/tests/libntp/calyearstart.c
@@ -1,7 +1,4 @@
 #include "config.h"
-#include "ntp_stdlib.h"
-
-#include "config.h"
 
 #include "unity.h"
 #include "unity_fixture.h"


=====================================
tests/libntp/ssl_init.c
=====================================
--- a/tests/libntp/ssl_init.c
+++ b/tests/libntp/ssl_init.c
@@ -1,7 +1,6 @@
 #include "config.h"
-#include "ntp_stdlib.h"
 
-#include "config.h"
+#include "ntp_stdlib.h"
 
 #include "unity.h"
 #include "unity_fixture.h"


=====================================
tests/libntp/tstotv.c
=====================================
--- a/tests/libntp/tstotv.c
+++ b/tests/libntp/tstotv.c
@@ -1,7 +1,6 @@
 #include "config.h"
-#include "ntp_stdlib.h"
 
-#include "config.h"
+#include "ntp_stdlib.h"
 
 #include "unity.h"
 #include "unity_fixture.h"


=====================================
tests/libntp/tvtots.c
=====================================
--- a/tests/libntp/tvtots.c
+++ b/tests/libntp/tvtots.c
@@ -1,7 +1,6 @@
 #include "config.h"
-#include "ntp_stdlib.h"
 
-#include "config.h"
+#include "ntp_stdlib.h"
 
 #include "unity.h"
 #include "unity_fixture.h"


=====================================
tests/unity/unity_fixture.c
=====================================
--- a/tests/unity/unity_fixture.c
+++ b/tests/unity/unity_fixture.c
@@ -7,6 +7,8 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "unity_fixture.h"
 #include "unity_internals.h"
 
@@ -173,9 +175,6 @@ void UnityMalloc_MakeMallocFailAfterCount(int countdown)
 #undef realloc
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct GuardBytes
 {
     size_t size;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/c715d3bbd9d6210801b454ce6bcfa496bd69fca3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160715/61417bb9/attachment.html>