Changeset e19eb97 for util.c

Timestamp:

Aug 15, 2009, 7:08:18 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1077891a

Parents:

fa4562c

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 02:37:51)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:18)

Message:

Add const qualifiers for char * and void *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• util.c (modified) (14 diffs)

util.c

@@ -6 +6 @@
 #include <pwd.h>
 
-void sepbar(char *in)
+void sepbar(const char *in)
 {
   char buff[1024];
@@ -13 +13 @@
   owl_view *v;
   int x, y, i;
-  char *foo, *appendtosepbar;
+  const char *foo, *appendtosepbar;
 
   sepwin=owl_global_get_curs_sepwin(&g);
@@ -125 +125 @@
 }
 
-char **atokenize(char *buffer, char *sep, int *i)
+char **atokenize(const char *buffer, const char *sep, int *i)
 {
   /* each element of return must be freed by user */
@@ -157 +157 @@
 }
 
-char *skiptokens(char *buff, int n) {
+const char *skiptokens(const char *buff, int n) {
   /* skips n tokens and returns where that would be.
    * TODO: handle quotes more sanely. */
@@ -177 +177 @@
  * duplicate slashes are removed.  Caller must free the return.
  */
-char *owl_util_makepath(char *in)
+char *owl_util_makepath(const char *in)
 {
   int i, j, x;
@@ -262 +262 @@
 }
 
-char **owl_parseline(char *line, int *argc)
+char **owl_parseline(const char *line, int *argc)
 {
   /* break a command line up into argv, argc.  The caller must free
@@ -409 +409 @@
  * if the named color is not available
  */
-int owl_util_string_to_color(char *color)
+int owl_util_string_to_color(const char *color)
 {
   int c;
@@ -439 +439 @@
 
 /* Return a string name of the given owl color */
-char *owl_util_color_to_string(int color)
+const char *owl_util_color_to_string(int color)
 {
   if (color==OWL_COLOR_BLACK)   return("black");
@@ -456 +456 @@
 char *owl_util_get_default_tty()
 {
-  char *tmp;
+  const char *tmp;
   char *out;
 
@@ -480 +480 @@
   owl_message *m;
   owl_fmtext *fm;
-  char *text, *ptr;
+  const char *text, *ptr;
   int place;
 
@@ -532 +532 @@
  * return.
  */
-char *owl_util_stripnewlines(char *in)
+char *owl_util_stripnewlines(const char *in)
 {
   
@@ -558 +558 @@
  * memory.
  */
-void owl_util_file_deleteline(char *filename, char *line, int backup)
+void owl_util_file_deleteline(const char *filename, const char *line, int backup)
 {
   char buff[LINE], *text;
@@ -646 +646 @@
    The caller is responsible for freeing the allocated string.
 */
-char * owl_util_baseclass(char * class)
+char * owl_util_baseclass(const char * class)
 {
   char *start, *end;
@@ -664 +664 @@
 }
 
-char * owl_get_datadir()
-{
-  char * datadir = getenv("BARNOWL_DATA_DIR");
+const char * owl_get_datadir()
+{
+  const char * datadir = getenv("BARNOWL_DATA_DIR");
   if(datadir != NULL)
     return datadir;