Fix some minor problems found by GCC 4.5.2's static checks.

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 2914b8de450b8f2e1d4d34e9e8477848f20c8e7e..5d430598f0c05857f6b8e51e33166d3173995029 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,13 +1,12 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
@@ -38,25 +35,25 @@ struct cm
     int cm_curX;                       /* Current column */
 
     /* Capabilities from termcap */
-    char *cm_up;               /* up (up) */
-    char *cm_down;             /* down (do) */
-    char *cm_left;             /* left (le) */
-    char *cm_right;            /* right (nd) */
-    char *cm_home;             /* home (ho) */
-    char *cm_cr;               /* carriage return (cr) */
-    char *cm_ll;               /* last line (ll) */
-    char *cm_tab;              /* tab (ta) */
-    char *cm_backtab;          /* backtab (bt) */
+    const char *cm_up;         /* up (up) */
+    const char *cm_down;       /* down (do) */
+    const char *cm_left;       /* left (le) */
+    const char *cm_right;      /* right (nd) */
+    const char *cm_home;       /* home (ho) */
+    const char *cm_cr;         /* carriage return (cr) */
+    const char *cm_ll;         /* last line (ll) */
+    const char *cm_tab;                /* tab (ta) */
+    const char *cm_backtab;    /* backtab (bt) */
     char *cm_abs;              /* absolute (cm) */
-    char *cm_habs;             /* horizontal absolute (ch) */
-    char *cm_vabs;             /* vertical absolute (cv) */
+    const char *cm_habs;       /* horizontal absolute (ch) */
+    const char *cm_vabs;       /* vertical absolute (cv) */
 #if 0
-    char *cm_ds;               /* "don't send" string (ds) */
+    const char *cm_ds;         /* "don't send" string (ds) */
 #endif
-    char *cm_multiup;          /* multiple up (UP) */
-    char *cm_multidown;                /* multiple down (DO) */
-    char *cm_multileft;                /* multiple left (LE) */
-    char *cm_multiright;       /* multiple right (RI) */
+    const char *cm_multiup;    /* multiple up (UP) */
+    const char *cm_multidown;  /* multiple down (DO) */
+    const char *cm_multileft;  /* multiple left (LE) */
+    const char *cm_multiright; /* multiple right (RI) */
     int cm_cols;               /* number of cols on screen (co) */
     int cm_rows;               /* number of rows on screen (li) */
     int cm_tabwidth;           /* tab width (it) */
@@ -160,17 +157,14 @@ extern char PC;                   /* Pad character */
 #define losecursor(tty)         (curX(tty) = -1, curY(tty) = -1)
 
 extern int cost;
-extern int evalcost ();
+extern int evalcost (int c);
 
 #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc))
 
 extern struct tty_display_info *current_tty;
-extern void cmcheckmagic P_ ((struct tty_display_info *));
-extern int cmputc P_ ((int));
-extern void cmcostinit P_ ((struct tty_display_info *));
-extern void cmgoto P_ ((struct tty_display_info *, int, int));
-extern void Wcm_clear P_ ((struct tty_display_info *));
-extern int Wcm_init P_ ((struct tty_display_info *));
-
-/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
-   (do not change this comment) */
+extern void cmcheckmagic (struct tty_display_info *);
+extern int cmputc (int);
+extern void cmcostinit (struct tty_display_info *);
+extern void cmgoto (struct tty_display_info *, int, int);
+extern void Wcm_clear (struct tty_display_info *);
+extern int Wcm_init (struct tty_display_info *);