gtx: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Change-Id: I444a8a325cca8da76f410185949103ccd873c743
Reviewed-on: http://gerrit.openafs.org/4329
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/gtx/X11windows.c b/src/gtx/X11windows.c
index 419655d00de4d80889142308d020f35959cf296c..951a60737a1f0b2cbf8ecd0556c64933621c6786 100644 (file)
--- a/src/gtx/X11windows.c
+++ b/src/gtx/X11windows.c
@@ -18,13 +18,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxX11win.h"         /*Interface definition */
-#include <stdio.h>             /*Standard I/O package */
 
-#if    !defined(NeXT)
-extern int errno;              /*System error number */
-#endif /* NeXT */
 int X11_debug;                 /*Is debugging turned on? */
 static char mn[] = "gator_X11windows"; /*Module name */
 

diff --git a/src/gtx/cb_test.c b/src/gtx/cb_test.c
index 53868b21f3023ac5d97f2e172098d5677e23e65f..1d0a032042bd403e6a592d932e2d08978974195d 100644 (file)
--- a/src/gtx/cb_test.c
+++ b/src/gtx/cb_test.c
@@ -14,10 +14,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextcb.h"         /*Module interface */
 
-
 #include "AFS_component_version_number.c"
 
 main(argc, argv)

diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c
index 4b3f32d3d2cc4c368fb53ce2ce1f86e364bbbfa3..808b628d01f260bb674fa4b766acde1c5ee83c7f 100644 (file)
--- a/src/gtx/curses_test.c
+++ b/src/gtx/curses_test.c
@@ -14,6 +14,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES)
 # define __HP_CURSES
 #endif

diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index 1d28040137a44c975608ee2756903efce5942677..7ac8fb15a71760fd325cfd86ef2a8b3c2e997676 100644 (file)
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -18,18 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-
-#include <sys/types.h>
-#include <sys/file.h>
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD80_ENV)
 #include <sgtty.h>
 #endif
-#include <stdio.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include <lwp.h>
 
@@ -37,8 +30,6 @@
 #include "gtxobjects.h"
 #include "gtxframe.h"
 
-
-
 int curses_debug;              /*Is debugging turned on? */
 static char mn[] = "gator_curseswindows";      /*Module name */
 

diff --git a/src/gtx/dumbwindows.c b/src/gtx/dumbwindows.c
index 3237de4ff768a609a832f72e6b40f65695ea62f0..56af6cf0bd50dd579da0cb46415f09aa03198765 100644 (file)
--- a/src/gtx/dumbwindows.c
+++ b/src/gtx/dumbwindows.c
@@ -16,10 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxdumbwin.h"                /*Interface definition */
-#include <stdio.h>             /*Standard I/O package */
-#include <errno.h>
 
 int dumb_debug;                        /*Is debugging turned on? */
 static char mn[] = "gator_dumbwindows";        /*Module name */

diff --git a/src/gtx/frame.c b/src/gtx/frame.c
index 620be0a3b9f356e0f7bc8ea198d627adb1a86a7c..b755b5be3639979cb34fbf3f136ace0b35aea8af 100644 (file)
--- a/src/gtx/frame.c
+++ b/src/gtx/frame.c
@@ -11,16 +11,10 @@
 #include <afs/param.h>
 #include <afs/stds.h>
 
-#ifdef AFS_HPUX_ENV
-#include <sys/types.h>
-#endif
+#include <roken.h>
+
 #include <lwp.h>
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 #include "gtxobjects.h"
 #include "gtxwindows.h"
 #include "gtxcurseswin.h"

diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c
index 29fabf58b88b35e8378694f1683298d450868c39..fef37033b9abb1ee4dee0ff9b07e80dd6154f246 100644 (file)
--- a/src/gtx/gtxtest.c
+++ b/src/gtx/gtxtest.c
@@ -10,11 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <string.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 #include "gtxwindows.h"
 #include "gtxobjects.h"
 #include "gtxtextobj.h"

diff --git a/src/gtx/input.c b/src/gtx/input.c
index 4fa7d33f5b58ed0b69372d4fa44dbaf6f83b63c8..932ce857fe455717ae1623ffcf36e3b7a6608e34 100644 (file)
--- a/src/gtx/input.c
+++ b/src/gtx/input.c
@@ -10,12 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <stdlib.h>
+#include <roken.h>
 
-#ifdef AFS_HPUX_ENV
-#include <sys/types.h>
-#endif
 #include <lwp.h>
+
 #include "gtxobjects.h"
 #include "gtxwindows.h"
 #include "gtxcurseswin.h"

diff --git a/src/gtx/keymap.c b/src/gtx/keymap.c
index 0cc8beb17dc847f52b76ab10f65dcef3992ec15d..db4a99d714675d93ba6fa53d6b114d19f7b21273 100644 (file)
--- a/src/gtx/keymap.c
+++ b/src/gtx/keymap.c
@@ -10,9 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <string.h>
-#include <stdlib.h>
+#include <roken.h>
 
 #include "gtxkeymap.h"
 

diff --git a/src/gtx/lightobject.c b/src/gtx/lightobject.c
index 71df8b22286efa739c20076e7c2260e73715d1b7..cc51f2b4ef9ee7c567b0173a8fd8305c1c9a9a15 100644 (file)
--- a/src/gtx/lightobject.c
+++ b/src/gtx/lightobject.c
@@ -16,12 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxlightobj.h"       /*Interface for this module */
-#include <stdio.h>             /*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 /*Externally-advertised array of light onode operations*/
 struct onodeops gator_light_ops = {

diff --git a/src/gtx/objdict.c b/src/gtx/objdict.c
index c2ded9c427faee1c9188c466f29ed5161b5c76ee..da39db76d71e739d368ae4ed2817abc6cad72e99 100644 (file)
--- a/src/gtx/objdict.c
+++ b/src/gtx/objdict.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxobjdict.h"                /*Interface for this module */
-#include <stdio.h>             /*Standard I/O package */
 
 static char mn[] = "gator_objdict";    /*Module name */
 static int objdict_debug;      /*Is debugging turned on? */

diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c
index e06c34464d2c24d46c7cebcc596a7c9863b170d4..95beaa5d2925b42b83829da41ffda054d2e3d59c 100644 (file)
--- a/src/gtx/object_test.c
+++ b/src/gtx/object_test.c
@@ -14,6 +14,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <afs/cmd.h>           /*Command interpretation library */
 
 #include "gtxscreenobj.h"      /*Gator screen object interface */
 #include "gtxtextobj.h"                /*Gator text object interface */
@@ -22,9 +25,6 @@
 #include "gtxcurseswin.h"      /*Gator curses window package */
 #include "gtxdumbwin.h"                /*Gator dumb terminal window package */
 #include "gtxX11win.h"         /*Gator X11 window package */
-#include <errno.h>
-#include <stdio.h>             /*Standard I/O stuff */
-#include <cmd.h>               /*Command interpretation library */
 
 
 /*

diff --git a/src/gtx/objects.c b/src/gtx/objects.c
index 1dfcf95293708f940dca193b71cbe24eb796514b..4023a7062cd49d2e6186267cb2e0a31cfbb593da 100644 (file)
--- a/src/gtx/objects.c
+++ b/src/gtx/objects.c
@@ -16,16 +16,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxobjects.h"                /*Interface for this module */
 #include "gtxtextobj.h"                /*Text object interface */
 #include "gtxlightobj.h"       /*Light object interface */
 #include "gtxobjdict.h"                /*Object dictionary module */
-#include <stdio.h>             /*Standard I/O stuff */
-#include <errno.h>
-
-#include <string.h>
-#include <stdlib.h>
 
 /*
  * Number of known gator object types.

diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c
index ac9c858f02393be73984452f59c345d02a19b39d..f94e650a5a877c3da41ec69abd0148c671849f56 100644 (file)
--- a/src/gtx/screen_test.c
+++ b/src/gtx/screen_test.c
@@ -14,13 +14,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <afs/cmd.h>           /*Command interpretation library */
 
 #include "gtxwindows.h"                /*Generalized window interface */
 #include "gtxcurseswin.h"      /*Curses window interface */
 #include "gtxdumbwin.h"                /*Dumb terminal window interface */
 #include "gtxX11win.h"         /*X11 window interface */
-#include <cmd.h>               /*Command interpretation library */
-#include <errno.h>
 
 
 /*

diff --git a/src/gtx/textcb.c b/src/gtx/textcb.c
index 0f15d7292fd9eedd006cf424dfcc268eafaf9d8a..857e153aa16bf17aa5156a645e25d1523ba61cec 100644 (file)
--- a/src/gtx/textcb.c
+++ b/src/gtx/textcb.c
@@ -16,12 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextcb.h"         /*Module interface */
-#include <stdio.h>             /*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 static int gator_textcb_debug; /*Is debugging output turned on? */
 

diff --git a/src/gtx/textobject.c b/src/gtx/textobject.c
index ffe004294479355d56c14fc078b87c6c46cc3e9b..e7464fde44c7d7527644c1f19e707850e7fa5568 100644 (file)
--- a/src/gtx/textobject.c
+++ b/src/gtx/textobject.c
@@ -14,16 +14,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextobj.h"                /*Interface for this module */
 #include "gtxwindows.h"                /*Gator window interface */
 #include "gtxcurseswin.h"      /*Gator curses window interface */
 #include "gtxdumbwin.h"                /*Gator dumb terminal window interface */
 #include "gtxX11win.h"         /*Gator X11 window interface */
-#include <stdio.h>             /*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 /*Externally-advertised array of text onode operations*/
 struct onodeops gator_text_ops = {

diff --git a/src/gtx/windows.c b/src/gtx/windows.c
index 45c391eda25d172af4a40287865951386aa79ccf..b9fd4e9715e01bb71f9452722236a862367317f8 100644 (file)
--- a/src/gtx/windows.c
+++ b/src/gtx/windows.c
@@ -18,6 +18,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 /* On DUX "IN" is a variable in curses.h, so this can be a bit of a problem */
 #ifdef IN