Death to RCS tags, remove compiler warning, get version from config.h.

10 files changed, 23 insertions, 48 deletions

diff --git a/src/buttonmap.c b/src/buttonmap.c
index 1875ec1..0f17fdc 100644
--- a/src/buttonmap.c
+++ b/src/buttonmap.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: buttonmap.c,v 1.1.1.2 1997/06/09 16:00:47 fred Exp $";
-
 int
 set_button_map(Display	*display,
 	       int	argc,
@@ -90,5 +88,4 @@ set_button_map(Display	*display,
     }
 }
 
-/* end of buttonmap.c
- */
+/* end of buttonmap.c */
diff --git a/src/feedback.c b/src/feedback.c
index 554642e..e16b74e 100644
--- a/src/feedback.c
+++ b/src/feedback.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: feedback.c,v 1.2 1996/12/19 19:40:41 fred Exp $";
-
 int
 set_ptr_feedback(Display	*display,
 		 int		argc,
@@ -115,7 +113,7 @@ get_feedbacks(Display	*display,
 	switch (state->class) {
 	case KbdFeedbackClass:
 	    k = (XKbdFeedbackState*) state;
-	    printf("KbdFeedbackClass id=%d\n", state->id);
+	    printf("KbdFeedbackClass id=%ld\n", state->id);
 	    printf("\tclick is %d\n", k->click);
 	    printf("\tpercent is %d\n", k->percent);
 	    printf("\tpitch is %d\n", k->pitch);
@@ -126,7 +124,7 @@ get_feedbacks(Display	*display,
 	    
 	case PtrFeedbackClass:
 	    p = (XPtrFeedbackState*) state;
-	    printf("PtrFeedbackClass id=%d\n", state->id);
+	    printf("PtrFeedbackClass id=%ld\n", state->id);
 	    printf("\taccelNum is %d\n", p->accelNum);
 	    printf("\taccelDenom is %d\n", p->accelDenom);
 	    printf("\tthreshold is %d\n", p->threshold);	    
@@ -134,14 +132,14 @@ get_feedbacks(Display	*display,
 
 	case StringFeedbackClass:
 	    s = (XStringFeedbackState*) state;
-	    printf("XStringFeedbackControl id=%d\n", state->id);
+	    printf("XStringFeedbackControl id=%ld\n", state->id);
 	    printf("\tmax_symbols is %d\n", s->max_symbols);
 	    printf("\tnum_syms_supported is %d\n", s->num_syms_supported);
 	    break;
 
 	case IntegerFeedbackClass:
 	    i = (XIntegerFeedbackState*) state;
-	    printf("XIntegerFeedbackControl id=%d\n", state->id);
+	    printf("XIntegerFeedbackControl id=%ld\n", state->id);
 	    printf("\tresolution is %d\n", i->resolution);
 	    printf("\tminVal is %d\n", i->minVal);
 	    printf("\tmaxVal is %d\n", i->maxVal);
@@ -149,13 +147,13 @@ get_feedbacks(Display	*display,
 
 	case LedFeedbackClass:
 	    l = (XLedFeedbackState*) state;
-	    printf("XLedFeedbackState id=%d\n", state->id);
+	    printf("XLedFeedbackState id=%ld\n", state->id);
 	    printf("\tled_values is %d\n", l->led_values);
 	    break;
 
 	case BellFeedbackClass:
 	    b = (XBellFeedbackState*) state;
-	    printf("XBellFeedbackControl id=%d\n", state->id);
+	    printf("XBellFeedbackControl id=%ld\n", state->id);
 	    printf("\tpercent is %d\n", b->percent);
 	    printf("\tpitch is %d\n", b->pitch);
 	    printf("\tduration is %d\n", b->duration);	    
@@ -166,5 +164,4 @@ get_feedbacks(Display	*display,
     return EXIT_SUCCESS;
 }
 
-/* end of ptrfdbk.c
-*/
+/* end of ptrfdbk.c */
diff --git a/src/list.c b/src/list.c
index 141bff7..6e660ae 100644
--- a/src/list.c
+++ b/src/list.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: list.c,v 1.1.1.2 1997/06/09 16:00:48 fred Exp $";
-
 static void
 print_info(XDeviceInfo	*info)
 {
@@ -114,5 +112,4 @@ list(Display	*display,
     return EXIT_SUCCESS;
 }
 
-/* end of list.c
- */
+/* end of list.c */
diff --git a/src/setint.c b/src/setint.c
index 408232d..3619d82 100644
--- a/src/setint.c
+++ b/src/setint.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: setint.c,v 1.1 1996/12/19 19:41:10 fred Exp $";
-
 int
 set_integer_feedback(Display	*display,
 		     int	argc,
@@ -65,5 +63,4 @@ set_integer_feedback(Display	*display,
     }
 }
 
-/* end of setint.c
- */
+/* end of setint.c */
diff --git a/src/setmode.c b/src/setmode.c
index b7860b1..ab18dc2 100644
--- a/src/setmode.c
+++ b/src/setmode.c
@@ -22,8 +22,7 @@
  */
 
 #include "xinput.h"
-
-static const char rcs_id[] = "$Id: setmode.c,v 1.1.1.2 1997/06/09 16:00:47 fred Exp $";
+#include <string.h>
 
 int
 set_mode(Display	*display,
@@ -66,5 +65,4 @@ set_mode(Display	*display,
     }
 }
 
-/* end of setmode.c
- */
+/* end of setmode.c */
diff --git a/src/setptr.c b/src/setptr.c
index c3dcf1c..eb2098b 100644
--- a/src/setptr.c
+++ b/src/setptr.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: setptr.c,v 1.1.1.2 1997/06/09 16:00:47 fred Exp $";
-
 int
 set_pointer(Display	*display,
 	    int		argc,
@@ -66,5 +64,4 @@ set_pointer(Display	*display,
     }
 }
 
-/* end of setptr.c
- */
+/* end of setptr.c */
diff --git a/src/state.c b/src/state.c
index 5f27baf..38d244b 100644
--- a/src/state.c
+++ b/src/state.c
@@ -23,8 +23,6 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: state.c,v 1.2 1997/06/14 19:11:49 fred Exp $";
-
 int
 query_state(Display	*display,
 	    int		argc,
@@ -106,5 +104,4 @@ query_state(Display	*display,
     return EXIT_SUCCESS;
 }
 
-/* end of state.c
-*/
+/* end of state.c */
diff --git a/src/test.c b/src/test.c
index a81d34a..5d54364 100644
--- a/src/test.c
+++ b/src/test.c
@@ -22,8 +22,7 @@
  */
 
 #include "xinput.h"
-
-static const char rcs_id[] = "$Id: test.c,v 1.3 1997/06/09 16:06:31 fred Exp $";
+#include <string.h>
 
 #define INVALID_EVENT_TYPE	-1
 
@@ -44,7 +43,6 @@ register_events(Display		*dpy,
     int			number = 0;	/* number of events registered */
     XEventClass		event_list[7];
     int			i;
-    XAnyClassPtr	any;
     XDevice		*device;
     Window		root_win;
     unsigned long	screen;
@@ -198,5 +196,4 @@ test(Display	*display,
     return EXIT_FAILURE;
 }
 
-/* end of test.c
- */
+/* end of test.c */
diff --git a/src/version.c b/src/version.c
index ca7cc9f..906ab6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -23,10 +23,11 @@
 
 #include "xinput.h"
 
-static const char rcs_id[] = "$Id: version.c,v 1.5 1997/06/14 19:11:49 fred Exp $";
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-/* must be synched with Imakefile */
-static const char version_id[] = "1.2";
+static const char version_id[] = VERSION;
 
 int
 version(Display	*display,
@@ -39,5 +40,4 @@ version(Display	*display,
     return EXIT_SUCCESS;
 }
 
-/* end of version.c
- */
+/* end of version.c */
diff --git a/src/xinput.c b/src/xinput.c
index c25a4de..58414da 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -23,8 +23,7 @@
 
 #include "xinput.h"
 #include <ctype.h>
-
-static const char rcs_id[] = "$Id: xinput.c,v 1.5 1997/06/09 16:06:31 fred Exp $";
+#include <string.h>
 
 typedef int (*prog)(
 #if NeedFunctionPrototypes
@@ -190,5 +189,4 @@ main(int argc, char * argv[])
     return EXIT_FAILURE;
 }
 
-/* end of xinput.c
- */
+/* end of xinput.c */