Changeset 64735f0

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:

075ba92

Parents:

1077891a

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 00:34:07)

git-committer:

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

Message:

Add const qualifiers for owl_variable *.

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

Files:

• owl.h (modified) (2 diffs)
• variable.c (modified) (12 diffs)

owl.h

@@ -218 +218 @@
   char *description;            /* detailed description */
   void *val;                    /* current value */
-  int  (*validate_fn)(struct _owl_variable *v, const void *newval);
+  int  (*validate_fn)(const struct _owl_variable *v, const void *newval);
                                 /* returns 1 if newval is valid */
   int  (*set_fn)(struct _owl_variable *v, const void *newval); 
@@ -232 +232 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  const void *(*get_fn)(struct _owl_variable *v);
+  const void *(*get_fn)(const struct _owl_variable *v);
                                 /* returns a reference to the current value.
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  int  (*get_tostring_fn)(struct _owl_variable *v, 
+  int  (*get_tostring_fn)(const struct _owl_variable *v, 
                           char *buf, int bufsize, const void *val); 
                                 /* converts val to a string 

variable.c

@@ -375 +375 @@
 /* commonly useful */
 
-int owl_variable_int_validate_gt0(owl_variable *v, const void *newval)
+int owl_variable_int_validate_gt0(const owl_variable *v, const void *newval)
 {
   if (newval == NULL) return(0);
@@ -382 +382 @@
 }
 
-int owl_variable_int_validate_positive(owl_variable *v, const void *newval)
+int owl_variable_int_validate_positive(const owl_variable *v, const void *newval)
 {
   if (newval == NULL) return(0);
@@ -628 +628 @@
 
 
-const char *owl_variable_get_description(owl_variable *v) {
+const char *owl_variable_get_description(const owl_variable *v) {
   return v->description;
 }
 
-const char *owl_variable_get_summary(owl_variable *v) {
+const char *owl_variable_get_summary(const owl_variable *v) {
   return v->summary;
 }
 
-const char *owl_variable_get_validsettings(owl_variable *v) {
+const char *owl_variable_get_validsettings(const owl_variable *v) {
   if (v->validsettings) {
     return v->validsettings;
@@ -839 +839 @@
 /* default common functions */
 
-const void *owl_variable_get_default(owl_variable *v) {
+const void *owl_variable_get_default(const owl_variable *v) {
   return v->val;
 }
@@ -849 +849 @@
 /* default functions for booleans */
 
-int owl_variable_bool_validate_default(owl_variable *v, const void *newval) {
+int owl_variable_bool_validate_default(const owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else if (*(const int*)newval==1 || *(const int*)newval==0) return(1);
@@ -871 +871 @@
 }
 
-int owl_variable_bool_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
+int owl_variable_bool_get_tostring_default(const owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");
@@ -889 +889 @@
 /* default functions for integers */
 
-int owl_variable_int_validate_default(owl_variable *v, const void *newval) {
+int owl_variable_int_validate_default(const owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else return (1);
@@ -910 +910 @@
 }
 
-int owl_variable_int_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
+int owl_variable_int_get_tostring_default(const owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");
@@ -922 +922 @@
 /* default functions for enums (a variant of integers) */
 
-int owl_variable_enum_validate(owl_variable *v, const void *newval) {  
+int owl_variable_enum_validate(const owl_variable *v, const void *newval) {  
   char **enums;
   int nenums, val;
@@ -952 +952 @@
 }
 
-int owl_variable_enum_get_tostring(owl_variable *v, char* buf, int bufsize, const void *val) {
+int owl_variable_enum_get_tostring(const owl_variable *v, char* buf, int bufsize, const void *val) {
   char **enums;
   int nenums, i;
@@ -973 +973 @@
 /* default functions for stringeans */
 
-int owl_variable_string_validate_default(struct _owl_variable *v, const void *newval) {
+int owl_variable_string_validate_default(const struct _owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else return (1);
@@ -991 +991 @@
 }
 
-int owl_variable_string_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
+int owl_variable_string_get_tostring_default(const owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");