Changeset defe4a3 for variable.c

Timestamp:

Aug 15, 2009, 7:08:17 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:

712caac

Parents:

7565f8f

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 01:20:29)

git-committer:

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

Message:

Add const qualifiers for int *.

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

File:

• variable.c (modified) (15 diffs)

variable.c

@@ -378 +378 @@
 {
   if (newval == NULL) return(0);
-  else if (*(int*)newval < 1) return(0);
+  else if (*(const int*)newval < 1) return(0);
   else return (1);
 }
@@ -385 +385 @@
 {
   if (newval == NULL) return(0);
-  else if (*(int*)newval < 0) return(0);
+  else if (*(const int*)newval < 0) return(0);
   else return (1);
 }
@@ -401 +401 @@
 int owl_variable_debug_set(owl_variable *v, void *newval)
 {
-  if (newval && (*(int*)newval == 1 || *(int*)newval == 0)) {
-    g.debug = *(int*)newval;
+  if (newval && (*(const int*)newval == 1 || *(const int*)newval == 0)) {
+    g.debug = *(const int*)newval;
   }
   return owl_variable_bool_set_default(v, newval);
@@ -411 +411 @@
 {
   if (newval) {
-    if (*(int*)newval == 1) {
+    if (*(const int*)newval == 1) {
       owl_aim_set_awaymsg(owl_global_get_aaway_msg(&g));
-    } else if (*(int*)newval == 0) {
+    } else if (*(const int*)newval == 0) {
       owl_aim_set_awaymsg("");
     }
@@ -423 +423 @@
 {
   if (newval) {
-    if (*(int*)newval == 1) {
+    if (*(const int*)newval == 1) {
       owl_function_zephyr_buddy_check(0);
     }
@@ -438 +438 @@
 
   if (newval && !owl_context_is_startup(owl_global_get_context(&g))) {
-    if (*(int*)newval == 2) {
+    if (*(const int*)newval == 2) {
       owl_function_command_norv("bindkey editmulti C-d command edit:delete-next-char");
-    } else if (*(int*)newval == 1) {
+    } else if (*(const int*)newval == 1) {
       owl_function_command_norv("bindkey editmulti C-d command editmulti:done-or-delete");
     } else {
@@ -748 +748 @@
 
 int owl_variable_get_int(owl_vardict *d, char *name) {
-  int *pi;
+  const int *pi;
   pi = owl_variable_get(d,name,OWL_VARIABLE_INT);
   if (!pi) return(-1);
@@ -755 +755 @@
 
 int owl_variable_get_bool(owl_vardict *d, char *name) {
-  int *pi;
+  const int *pi;
   pi = owl_variable_get(d,name,OWL_VARIABLE_BOOL);
   if (!pi) return(-1);
@@ -851 +851 @@
 int owl_variable_bool_validate_default(owl_variable *v, void *newval) {
   if (newval == NULL) return(0);
-  else if (*(int*)newval==1 || *(int*)newval==0) return(1);
+  else if (*(const int*)newval==1 || *(const int*)newval==0) return(1);
   else return (0);
 }
@@ -859 +859 @@
     if (!v->validate_fn(v, newval)) return(-1);
   }
-  *(int*)v->val = *(int*)newval;
+  *(int*)v->val = *(const int*)newval;
   return(0);
 }
@@ -875 +875 @@
     snprintf(buf, bufsize, "<null>");
     return -1;
-  } else if (*(int*)val == 0) {
+  } else if (*(const int*)val == 0) {
     snprintf(buf, bufsize, "off");
     return 0;
-  } else if (*(int*)val == 1) {
+  } else if (*(const int*)val == 1) {
     snprintf(buf, bufsize, "on");
     return 0;
@@ -898 +898 @@
     if (!v->validate_fn(v, newval)) return(-1);
   }
-  *(int*)v->val = *(int*)newval;
+  *(int*)v->val = *(const int*)newval;
   return(0);
 }
@@ -915 +915 @@
     return -1;
   } else {
-    snprintf(buf, bufsize, "%d", *(int*)val);
+    snprintf(buf, bufsize, "%d", *(const int*)val);
     return 0;
   } 
@@ -929 +929 @@
   if (enums == NULL) return(0);
   atokenize_free(enums, nenums);
-  val = *(int*)newval;
+  val = *(const int*)newval;
   if (val < 0 || val >= nenums) {
     return(0);
@@ -961 +961 @@
   }
   enums = atokenize(v->validsettings, ",", &nenums);
-  i = *(int*)val;
+  i = *(const int*)val;
   if (i<0 || i>=nenums) {
     snprintf(buf, bufsize, "<invalid:%d>",i);