* include/sockio.h (connect_to_local_server): First parameter now

	const char*.
	* include/pixmap.h (zzopen): Second parameter now const char*.
	* lib/pixmap.c: Propagate change.
	* lib/sockio-c.c: Likewise.
	* hyper/parse-types.c (parse_verbatim): Tidy.
	* hyper/spadint.c (print_source_to_string1): Likewise.
	* hyper/initx.h (init_top_window): Change parameter type to const
	char*.
	* hyper/initx.c: Propagate change.
	* hyper/titlebar.c: Tidy.
	(set_name_and_icon): icon_name is now of type const char*.
	(get_border_properties): bwidth is not of type const char*.
	(mergeDatabases): classname is now of type const char*.
	(is_it_850): probtbl.name is now of type const char*.

10 files changed, 38 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2893ba58..b1d21a93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,23 @@
 2012-08-18  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* include/sockio.h (connect_to_local_server): First parameter now
+	const char*.
+	* include/pixmap.h (zzopen): Second parameter now const char*.
+	* lib/pixmap.c: Propagate change.
+	* lib/sockio-c.c: Likewise.
+	* hyper/parse-types.c (parse_verbatim): Tidy.
+	* hyper/spadint.c (print_source_to_string1): Likewise.
+	* hyper/initx.h (init_top_window): Change parameter type to const
+	char*.
+	* hyper/initx.c: Propagate change.
+	* hyper/titlebar.c: Tidy.
+	(set_name_and_icon): icon_name is now of type const char*.
+	(get_border_properties): bwidth is not of type const char*.
+	(mergeDatabases): classname is now of type const char*.
+	(is_it_850): probtbl.name is now of type const char*.
+
+2012-08-18  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* include/util.H1 (getmemWithLine): Second argument is now const char*.
 	(saymemWithLine): First argument is now char*.
 	* lib/util.c: Propogate change.
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index 9dc6fb66..4cfae4ef 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -219,7 +219,7 @@ initializeWindowSystem(void)
  */
 
 int
-init_top_window(char *name)
+init_top_window(const char *name)
 {
     HyperDocPage *page;
     XSetWindowAttributes wa;    /* The X attributes structure */
@@ -377,7 +377,7 @@ init_form_window(char *name, int cols)
 static void
 set_name_and_icon(void)
 {
-    char *icon_name = "HyperDoc";
+    const char *icon_name = "HyperDoc";
     char *s;
     Pixmap icon_pixmap;
     XWMHints wmhints;
@@ -410,7 +410,7 @@ set_name_and_icon(void)
 static int
 get_border_properties(void)
 {
-    char *bwidth;
+    const char *bwidth;
     /*char *bc = NULL;*/
     int bw;
     /*XColor color_def, color_db;*/
@@ -953,7 +953,7 @@ mergeDatabases(void)
     XrmDatabase homeDB, serverDB, applicationDB;
     char filenamebuf[1024];
     char *filename = &filenamebuf[0];
-    char *classname = "OpenAxiom";
+    const char *classname = "OpenAxiom";
     char name[255];
 
 /*    fprintf(stderr,"initx:mergeDatabases:entered\n");*/
@@ -1003,7 +1003,7 @@ is_it_850(XFontStruct *fontarg)
  char *s;
  int i,val;
  static struct {
-      char *name;
+      const char *name;
       Atom format;
       Atom atom;
       } proptbl = { "CHARSET_ENCODING", XA_ATOM };
diff --git a/src/hyper/initx.h b/src/hyper/initx.h
index 7005ba3b..fe043968 100644
--- a/src/hyper/initx.h
+++ b/src/hyper/initx.h
@@ -40,7 +40,7 @@
 
 extern void change_text(int color , XFontStruct * font);
 extern int init_form_window(char * name , int cols);
-extern int init_top_window(char * name);
+extern int init_top_window(const char * name);
 extern void initializeWindowSystem(void);
 extern int is_it_850(XFontStruct * fontarg);
 
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index a548347a..e20d77b3 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -356,7 +356,9 @@ void
 parse_verbatim(int type)
 {
     int size = 0, c;
-    char *end_string, *vb = vbuf, *es;
+    char *vb = vbuf;
+    const char *end_string;
+    const char* es;
 
     curr_node->type = type;
     if (token.id[-1])
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index 20d1b2a2..d31ed6da 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -920,7 +920,7 @@ char *
 print_source_to_string1(TextNode *command,int * sizeBuf)
 {
     char *c = p2sBuf;
-    char *s;
+    const char *s;
     InputItem *item;
     LineStruct *curr_line;
     int lcount;
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index 6cf37472..23f20f57 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -83,11 +83,11 @@ static char *noopfile = "noop.bitmap";
 
 #else
 
-static char *tw1file  = "exit3d.bitmap";
-static char *tw2file  = "help3d.bitmap";
-static char *tw3file  = "home3d.bitmap";
-static char *tw4file  = "up3d.bitmap";
-static char *noopfile = "noop3d.bitmap";
+static const char* tw1file  = "exit3d.bitmap";
+static const char* tw2file  = "help3d.bitmap";
+static const char* tw3file  = "home3d.bitmap";
+static const char* tw4file  = "up3d.bitmap";
+static const char* noopfile = "noop3d.bitmap";
 
 #define BACKCOLOR gControlBackgroundColor
 #define BUTTGC    fControlGC
diff --git a/src/include/pixmap.h b/src/include/pixmap.h
index a181b979..2d9b0272 100644
--- a/src/include/pixmap.h
+++ b/src/include/pixmap.h
@@ -37,7 +37,7 @@
 #define OPENAXIOM_PIXMAP_included
 
 extern int file_exists(char * );
-extern FILE * zzopen(char *  , char * );
+extern FILE * zzopen(char *  , const char* );
 extern void write_pixmap_file(Display *  , int  , char *  , Window  , int  , int  , int  , int );
 extern int read_pixmap_file(Display *  , int  , char *  , XImage * *  , int *  , int * );
 
diff --git a/src/include/sockio.h b/src/include/sockio.h
index 031809f2..a62bda86 100644
--- a/src/include/sockio.h
+++ b/src/include/sockio.h
@@ -121,7 +121,7 @@ OPENAXIOM_C_EXPORT int wait_for_client_write(openaxiom_sio*,
 
 OPENAXIOM_C_EXPORT int make_server_name(char*, const char*);
 OPENAXIOM_C_EXPORT int make_server_number(void);
-OPENAXIOM_C_EXPORT openaxiom_sio* connect_to_local_server(char*, int, int);
+OPENAXIOM_C_EXPORT openaxiom_sio* connect_to_local_server(const char*, int, int);
 OPENAXIOM_C_EXPORT int open_server(const char*);
 OPENAXIOM_C_EXPORT int accept_connection(openaxiom_sio*);
 OPENAXIOM_C_EXPORT int sselect(int, fd_set*, fd_set*, fd_set*, void*);
diff --git a/src/lib/pixmap.c b/src/lib/pixmap.c
index c09af5a6..2d321743 100644
--- a/src/lib/pixmap.c
+++ b/src/lib/pixmap.c
@@ -70,7 +70,7 @@ file_exists(char *file)
 }
 
 FILE *
-zzopen(char *file,char * mode)
+zzopen(char *file, const char* mode)
 {
     char com[512], zfile[512];
 
diff --git a/src/lib/sockio-c.c b/src/lib/sockio-c.c
index a7efa4e2..21ef5504 100644
--- a/src/lib/sockio-c.c
+++ b/src/lib/sockio-c.c
@@ -971,7 +971,7 @@ sock_send_wakeup(int purpose)
 }
 
 OPENAXIOM_C_EXPORT openaxiom_sio *
-connect_to_local_server_new(char *server_name, int purpose, int time_out)
+connect_to_local_server_new(const char *server_name, int purpose, int time_out)
 {
   int max_con=(time_out == 0 ? 1000000 : time_out), i, code=-1;
   openaxiom_sio *sock;
@@ -1023,7 +1023,7 @@ connect_to_local_server_new(char *server_name, int purpose, int time_out)
 }
 
 OPENAXIOM_C_EXPORT openaxiom_sio *
-connect_to_local_server(char *server_name, int purpose, int time_out)
+connect_to_local_server(const char *server_name, int purpose, int time_out)
 {
   int max_con=(time_out == 0 ? 1000000 : time_out), i, code=-1;
   openaxiom_sio *sock;