[Emacs-diffs] /srv/bzr/emacs/trunk r100692: Convert some prototypes to standard C.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100692
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-02 15:18:28 -0700
message:
  Convert some prototypes to standard C.
  * lib-src/make-docfile.c (xmalloc, xrealloc, concat, readline, fatal):
  * lib-src/b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to
  standard C prototypes.
  
  * src/term.c (term_clear_mouse_face, Fidentity):
  * src/syssignal.h (signal_handler_t):
  * src/lisp.h (memory_warnings):
  * src/coding.h (preferred_coding_system):
  * src/cm.h (evalcost):
  * src/blockinput.h (reinvoke_input_signal): Convert to standard C prototypes.
modified:
  lib-src/ChangeLog
  lib-src/b2m.c
  lib-src/make-docfile.c
  src/ChangeLog
  src/blockinput.h
  src/cm.h
  src/coding.h
  src/lisp.h
  src/syssignal.h
  src/term.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-07-02 12:19:53 +0000
+++ b/lib-src/ChangeLog 2010-07-02 22:18:28 +0000
@@ -1,3 +1,9 @@
+2010-07-02  Dan Nicolaescu  <address@hidden>
+
+       * make-docfile.c (xmalloc, xrealloc, concat, readline, fatal):
+       * b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to
+       standard C prototypes.
+
 2010-07-02  Jan Djärv  <address@hidden>
 
        * ebrowse.c: Remove P_ and __P.

=== modified file 'lib-src/b2m.c'
--- a/lib-src/b2m.c     2010-01-04 05:35:18 +0000
+++ b/lib-src/b2m.c     2010-07-02 22:18:28 +0000
@@ -66,10 +66,11 @@
 
 extern char *strtok();
 
-long *xmalloc (), *xrealloc ();
-char *concat ();
-long readline ();
-void fatal ();
+long *xmalloc (unsigned int size);
+long *xrealloc (char *ptr, unsigned int size);
+char *concat (char *s1, char *s2, char *s3);
+long readline (struct linebuffer *linebuffer, register FILE *stream);
+void fatal (char *message);
 
 /*
  * xnew -- allocate storage.  SYNOPSIS: Type *xnew (int n, Type);

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2010-01-18 03:58:35 +0000
+++ b/lib-src/make-docfile.c    2010-07-02 22:18:28 +0000
@@ -67,9 +67,9 @@
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
 #endif
 
-int scan_file ();
-int scan_lisp_file ();
-int scan_c_file ();
+int scan_file (char *filename);
+int scan_lisp_file (char *filename, char *mode);
+int scan_c_file (char *filename, char *mode);
 
 #ifdef MSDOS
 /* s/msdos.h defines this as sys_chdir, but we're not linking with the

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-02 13:10:00 +0000
+++ b/src/ChangeLog     2010-07-02 22:18:28 +0000
@@ -1,3 +1,12 @@
+2010-07-02  Dan Nicolaescu  <address@hidden>
+
+       * term.c (term_clear_mouse_face, Fidentity):
+       * syssignal.h (signal_handler_t):
+       * lisp.h (memory_warnings):
+       * coding.h (preferred_coding_system):
+       * cm.h (evalcost):
+       * blockinput.h (reinvoke_input_signal): Convert to standard C 
prototypes.
+
 2010-07-02  Eli Zaretskii  <address@hidden>
 
        * dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_

=== modified file 'src/blockinput.h'
--- a/src/blockinput.h  2010-01-13 08:35:10 +0000
+++ b/src/blockinput.h  2010-07-02 22:18:28 +0000
@@ -123,7 +123,7 @@
 
 /* Defined in keyboard.c */
 /* Don't use a prototype here; it causes trouble in some files.  */
-extern void reinvoke_input_signal ();
+extern void reinvoke_input_signal (void);
 
 #endif /* EMACS_BLOCKINPUT_H */
 

=== modified file 'src/cm.h'
--- a/src/cm.h  2010-07-02 09:26:33 +0000
+++ b/src/cm.h  2010-07-02 22:18:28 +0000
@@ -158,7 +158,7 @@
 #define losecursor(tty)         (curX(tty) = -1, curY(tty) = -1)
 
 extern int cost;
-extern int evalcost ();
+extern int evalcost (char c);
 
 #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, 
affcnt, putc))
 

=== modified file 'src/coding.h'
--- a/src/coding.h      2010-07-02 09:26:33 +0000
+++ b/src/coding.h      2010-07-02 22:18:28 +0000
@@ -753,7 +753,7 @@
   } while (0)
 
 
-extern Lisp_Object preferred_coding_system ();
+extern Lisp_Object preferred_coding_system (void);
 
 
 extern Lisp_Object Qutf_8, Qutf_8_emacs;

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-07-02 12:19:53 +0000
+++ b/src/lisp.h        2010-07-02 22:18:28 +0000
@@ -2668,7 +2668,7 @@
 extern void syms_of_xsettings (void);
 
 /* Defined in vm-limit.c.  */
-extern void memory_warnings (POINTER_TYPE *, void (*warnfun) ());
+extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char*));
 
 /* Defined in alloc.c */
 extern void check_pure_size (void);

=== modified file 'src/syssignal.h'
--- a/src/syssignal.h   2010-07-02 09:26:33 +0000
+++ b/src/syssignal.h   2010-07-02 22:18:28 +0000
@@ -76,7 +76,7 @@
 
 /* Whether this is what all systems want or not, this is what
    appears to be assumed in the source, for example data.c:arith_error.  */
-typedef RETSIGTYPE (*signal_handler_t) (/*int*/);
+typedef RETSIGTYPE (*signal_handler_t) (int);
 
 signal_handler_t sys_signal (int signal_number, signal_handler_t action);
 sigset_t sys_sigblock   (sigset_t new_mask);

=== modified file 'src/term.c'
--- a/src/term.c        2010-07-02 12:19:53 +0000
+++ b/src/term.c        2010-07-02 22:18:28 +0000
@@ -187,7 +187,7 @@
 #ifdef HAVE_GPM
 #include <sys/fcntl.h>
 
-static void term_clear_mouse_face ();
+static void term_clear_mouse_face (void);
 static void term_mouse_highlight (struct frame *f, int x, int y);
 
 /* The device for which we have enabled gpm support (or NULL).  */
@@ -1385,7 +1385,7 @@
      function key specification, rather than giving the user an error and
      refusing to run at all on such a terminal.  */
 
-  extern Lisp_Object Fidentity ();
+  extern Lisp_Object Fidentity (Lisp_Object);
   term_get_fkeys_address = address;
   term_get_fkeys_kboard = kboard;
   internal_condition_case (term_get_fkeys_1, Qerror, Fidentity);