Changeset 0a0fb74

Timestamp:

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

a352029b

Parents:

3f8514b

git-author:

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

git-committer:

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

Message:

Add const qualifiers for owl_cmd *.

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

Files:

• cmd.c (modified) (8 diffs)
• commands.c (modified) (1 diff)
• functions.c (modified) (2 diffs)
• keymap.c (modified) (1 diff)
• perlconfig.c (modified) (1 diff)

cmd.c

@@ -5 +5 @@
 #include "owl.h"
 
-extern owl_cmd commands_to_init[];
+extern const owl_cmd commands_to_init[];
 
 /**************************************************************************/
@@ -23 +23 @@
 
 /* for bulk initialization at startup */
-int owl_cmddict_add_from_list(owl_cmddict *cd, owl_cmd *cmds) {
-  owl_cmd *cur;
+int owl_cmddict_add_from_list(owl_cmddict *cd, const owl_cmd *cmds) {
+  const owl_cmd *cur;
   int ret = 0;
   for (cur = cmds; cur->name != NULL; cur++) {
@@ -38 +38 @@
 }
 
-owl_cmd *owl_cmddict_find(const owl_cmddict *d, const char *name) {
+const owl_cmd *owl_cmddict_find(const owl_cmddict *d, const char *name) {
   return owl_dict_find_element(d, name);
 }
@@ -55 +55 @@
 }
 
-int owl_cmddict_add_cmd(owl_cmddict *cd, owl_cmd * cmd) {
+int owl_cmddict_add_cmd(owl_cmddict *cd, const owl_cmd * cmd) {
   owl_cmd * newcmd = owl_malloc(sizeof(owl_cmd));
   if(owl_cmd_create_from_template(newcmd, cmd) < 0) {
@@ -67 +67 @@
 char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff) {
   char *retval = NULL;
-  owl_cmd *cmd;
+  const owl_cmd *cmd;
 
   if (!strcmp(argv[0], "")) {
@@ -132 +132 @@
 
 /* sets up a new command based on a template, copying strings */
-int owl_cmd_create_from_template(owl_cmd *cmd, owl_cmd *templ) {
+int owl_cmd_create_from_template(owl_cmd *cmd, const owl_cmd *templ) {
   *cmd = *templ;
   if (!templ->name) return(-1);
@@ -162 +162 @@
 }
 
-int owl_cmd_is_context_valid(owl_cmd *cmd, const owl_context *ctx) { 
+int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) { 
   if (owl_context_matches(ctx, cmd->validctx)) return 1;
   else return 0;
 }
 
-char *owl_cmd_execute(owl_cmd *cmd, const owl_cmddict *cd, const owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff) {
+char *owl_cmd_execute(const owl_cmd *cmd, const owl_cmddict *cd, const owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff) {
   static int alias_recurse_depth = 0;
   int ival=0;
@@ -238 +238 @@
 
 /* returns a reference */
-const char *owl_cmd_get_summary(owl_cmd *cmd) {
+const char *owl_cmd_get_summary(const owl_cmd *cmd) {
   return cmd->summary;
 }
 
 /* returns a summary line describing this keymap.  the caller must free. */
-char *owl_cmd_describe(owl_cmd *cmd) {
+char *owl_cmd_describe(const owl_cmd *cmd) {
   char *s;
   int slen;

commands.c

@@ -40 +40 @@
 
 
-owl_cmd commands_to_init[]
+const owl_cmd commands_to_init[]
   = {
   OWLCMD_ARGS("zlog", owl_command_zlog, OWL_CTX_ANY,

functions.c

@@ -39 +39 @@
 }
 
-owl_cmd *owl_function_get_cmd(const char *name)
+const owl_cmd *owl_function_get_cmd(const char *name)
 {
   return owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -110 +110 @@
 char *owl_function_cmd_describe(const char *name)
 {
-  owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
+  const owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
   if (cmd) return owl_cmd_describe(cmd);
   else return(NULL);

keymap.c

@@ -102 +102 @@
   for (i=0; i<nbindings; i++) {
     char buff[100];
-    owl_cmd *cmd;
+    const owl_cmd *cmd;
     const char *tmpdesc, *desc = "";
 

perlconfig.c

@@ -452 +452 @@
 }
 
-char *owl_perlconfig_perlcmd(owl_cmd *cmd, int argc, const char *const *argv)
+char *owl_perlconfig_perlcmd(const owl_cmd *cmd, int argc, const char *const *argv)
 {
   int i, count;