diff options
| author | Dan Nicolaescu | 2010-09-20 14:44:39 +0300 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-09-20 14:44:39 +0300 |
| commit | a953c1e3df1015056523747595b2ca324cdbe871 (patch) | |
| tree | 871e8f0d9aed5862ba8cf1ffa25801d0ee6b0c5c | |
| parent | 6553950651fdac87d3273885fc4ac2ecf00f8cfd (diff) | |
| download | emacs-a953c1e3df1015056523747595b2ca324cdbe871.tar.gz emacs-a953c1e3df1015056523747595b2ca324cdbe871.zip | |
Use const for constant arguments.
* lwlib/lwlib.h (lw_register_widget, lw_create_widget):
* lwlib/lwlib.c (allocate_widget_info, lw_register_widget)
(lw_create_widget, separator_table): Use const.
| -rw-r--r-- | lwlib/ChangeLog | 6 | ||||
| -rw-r--r-- | lwlib/lwlib.c | 20 | ||||
| -rw-r--r-- | lwlib/lwlib.h | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index e7e428fea15..783e3626aee 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-09-20 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * lwlib.h (lw_register_widget, lw_create_widget): | ||
| 4 | * lwlib.c (allocate_widget_info, lw_register_widget) | ||
| 5 | (lw_create_widget, separator_table): Use const. | ||
| 6 | |||
| 1 | 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 8 | ||
| 3 | * xlwmenu.c (abort_gracefully): Mark as NO_RETURN. | 9 | * xlwmenu.c (abort_gracefully): Mark as NO_RETURN. |
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 2b72f54bb19..44bdd81411c 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c | |||
| @@ -66,9 +66,9 @@ static widget_info* | |||
| 66 | all_widget_info = NULL; | 66 | all_widget_info = NULL; |
| 67 | 67 | ||
| 68 | #ifdef USE_MOTIF | 68 | #ifdef USE_MOTIF |
| 69 | char *lwlib_toolkit_type = "motif"; | 69 | const char *lwlib_toolkit_type = "motif"; |
| 70 | #else | 70 | #else |
| 71 | char *lwlib_toolkit_type = "lucid"; | 71 | const char *lwlib_toolkit_type = "lucid"; |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | static widget_value *merge_widget_value (widget_value *, | 74 | static widget_value *merge_widget_value (widget_value *, |
| @@ -80,7 +80,7 @@ static void safe_free_str (char *); | |||
| 80 | static void free_widget_value_tree (widget_value *); | 80 | static void free_widget_value_tree (widget_value *); |
| 81 | static widget_value *copy_widget_value_tree (widget_value *, | 81 | static widget_value *copy_widget_value_tree (widget_value *, |
| 82 | change_type); | 82 | change_type); |
| 83 | static widget_info *allocate_widget_info (char *, char *, LWLIB_ID, | 83 | static widget_info *allocate_widget_info (const char *, const char *, LWLIB_ID, |
| 84 | widget_value *, | 84 | widget_value *, |
| 85 | lw_callback, lw_callback, | 85 | lw_callback, lw_callback, |
| 86 | lw_callback, lw_callback); | 86 | lw_callback, lw_callback); |
| @@ -249,8 +249,8 @@ copy_widget_value_tree (widget_value *val, change_type change) | |||
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | static widget_info * | 251 | static widget_info * |
| 252 | allocate_widget_info (char* type, | 252 | allocate_widget_info (const char* type, |
| 253 | char* name, | 253 | const char* name, |
| 254 | LWLIB_ID id, | 254 | LWLIB_ID id, |
| 255 | widget_value* val, | 255 | widget_value* val, |
| 256 | lw_callback pre_activate_cb, | 256 | lw_callback pre_activate_cb, |
| @@ -823,8 +823,8 @@ instantiate_widget_instance (widget_instance *instance) | |||
| 823 | } | 823 | } |
| 824 | 824 | ||
| 825 | void | 825 | void |
| 826 | lw_register_widget (char* type, | 826 | lw_register_widget (const char* type, |
| 827 | char* name, | 827 | const char* name, |
| 828 | LWLIB_ID id, | 828 | LWLIB_ID id, |
| 829 | widget_value* val, | 829 | widget_value* val, |
| 830 | lw_callback pre_activate_cb, | 830 | lw_callback pre_activate_cb, |
| @@ -867,7 +867,7 @@ lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p) | |||
| 867 | } | 867 | } |
| 868 | 868 | ||
| 869 | Widget | 869 | Widget |
| 870 | lw_create_widget (char* type, char* name, LWLIB_ID id, widget_value* val, | 870 | lw_create_widget (const char* type, const char* name, LWLIB_ID id, widget_value* val, |
| 871 | Widget parent, Boolean pop_up_p, | 871 | Widget parent, Boolean pop_up_p, |
| 872 | lw_callback pre_activate_cb, lw_callback selection_cb, | 872 | lw_callback pre_activate_cb, lw_callback selection_cb, |
| 873 | lw_callback post_activate_cb, lw_callback highlight_cb) | 873 | lw_callback post_activate_cb, lw_callback highlight_cb) |
| @@ -1326,7 +1326,7 @@ lw_separator_p (char *label, enum menu_separator *type, int motif_p) | |||
| 1326 | { | 1326 | { |
| 1327 | static struct separator_table | 1327 | static struct separator_table |
| 1328 | { | 1328 | { |
| 1329 | char *name; | 1329 | const char *name; |
| 1330 | enum menu_separator type; | 1330 | enum menu_separator type; |
| 1331 | } | 1331 | } |
| 1332 | separator_names[] = | 1332 | separator_names[] = |
| @@ -1371,7 +1371,7 @@ lw_separator_p (char *label, enum menu_separator *type, int motif_p) | |||
| 1371 | /* Alternative, more Emacs-style names. */ | 1371 | /* Alternative, more Emacs-style names. */ |
| 1372 | static struct separator_table | 1372 | static struct separator_table |
| 1373 | { | 1373 | { |
| 1374 | char *name; | 1374 | const char *name; |
| 1375 | enum menu_separator type; | 1375 | enum menu_separator type; |
| 1376 | } | 1376 | } |
| 1377 | separator_names[] = | 1377 | separator_names[] = |
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index 1ee075257f1..36f880d6d13 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h | |||
| @@ -132,14 +132,14 @@ typedef struct _widget_value | |||
| 132 | 132 | ||
| 133 | typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data); | 133 | typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data); |
| 134 | 134 | ||
| 135 | void lw_register_widget (char* type, char* name, LWLIB_ID id, | 135 | void lw_register_widget (const char* type, const char* name, LWLIB_ID id, |
| 136 | widget_value* val, lw_callback pre_activate_cb, | 136 | widget_value* val, lw_callback pre_activate_cb, |
| 137 | lw_callback selection_cb, | 137 | lw_callback selection_cb, |
| 138 | lw_callback post_activate_cb, | 138 | lw_callback post_activate_cb, |
| 139 | lw_callback highlight_cb); | 139 | lw_callback highlight_cb); |
| 140 | Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); | 140 | Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); |
| 141 | Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); | 141 | Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); |
| 142 | Widget lw_create_widget (char* type, char* name, LWLIB_ID id, | 142 | Widget lw_create_widget (const char* type, const char* name, LWLIB_ID id, |
| 143 | widget_value* val, Widget parent, Boolean pop_up_p, | 143 | widget_value* val, Widget parent, Boolean pop_up_p, |
| 144 | lw_callback pre_activate_cb, | 144 | lw_callback pre_activate_cb, |
| 145 | lw_callback selection_cb, | 145 | lw_callback selection_cb, |