- Timestamp:
- Jun 22, 2011, 3:40:50 PM (13 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- b343c2c
- Parents:
- 84a071f
- git-author:
- Jason Gross <jgross@mit.edu> (06/06/11 05:24:30)
- git-committer:
- Nelson Elhage <nelhage@mit.edu> (06/22/11 15:40:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cmd.c
raad166a rd427f08 9 9 /**************************************************************************/ 10 10 11 int owl_cmddict_setup(owl_cmddict *cd) { 11 void owl_cmddict_setup(owl_cmddict *cd) 12 { 12 13 owl_cmddict_init(cd); 13 returnowl_cmd_add_defaults(cd);14 owl_cmd_add_defaults(cd); 14 15 } 15 16 … … 19 20 20 21 /* for bulk initialization at startup */ 21 int owl_cmddict_add_from_list(owl_cmddict *cd, const owl_cmd *cmds) { 22 void owl_cmddict_add_from_list(owl_cmddict *cd, const owl_cmd *cmds) 23 { 22 24 const owl_cmd *cur; 23 int ret = 0;24 25 for (cur = cmds; cur->name != NULL; cur++) { 25 ret = owl_cmddict_add_cmd(cd, cur); 26 if (ret < 0) break; 27 } 28 return ret; 26 owl_cmddict_add_cmd(cd, cur); 27 } 29 28 } 30 29 … … 38 37 39 38 /* creates a new command alias */ 40 intowl_cmddict_add_alias(owl_cmddict *cd, const char *alias_from, const char *alias_to) {39 void owl_cmddict_add_alias(owl_cmddict *cd, const char *alias_from, const char *alias_to) { 41 40 owl_cmd *cmd; 42 41 cmd = g_new(owl_cmd, 1); … … 44 43 owl_perlconfig_new_command(cmd->name); 45 44 owl_dict_insert_element(cd, cmd->name, cmd, (void (*)(void *))owl_cmd_delete); 46 return(0);47 45 } 48 46 … … 57 55 } 58 56 59 char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff) { 57 /* caller must free the return */ 58 G_GNUC_WARN_UNUSED_RESULT char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff) 59 { 60 60 char *retval = NULL; 61 61 const owl_cmd *cmd; … … 72 72 } 73 73 74 char *owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *cmdbuff) { 74 /* caller must free the return */ 75 G_GNUC_WARN_UNUSED_RESULT char *owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *cmdbuff) 76 { 75 77 char **argv; 76 78 int argc; … … 94 96 } 95 97 96 char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) { 98 /* caller must free the return */ 99 G_GNUC_WARN_UNUSED_RESULT char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) 100 { 97 101 char *buff; 98 102 char *retval = NULL; … … 121 125 } 122 126 123 intowl_cmd_create_alias(owl_cmd *cmd, const char *name, const char *aliased_to) {127 void owl_cmd_create_alias(owl_cmd *cmd, const char *name, const char *aliased_to) { 124 128 memset(cmd, 0, sizeof(owl_cmd)); 125 129 cmd->name = g_strdup(name); 126 130 cmd->cmd_aliased_to = g_strdup(aliased_to); 127 131 cmd->summary = g_strdup_printf("%s%s", OWL_CMD_ALIAS_SUMMARY_PREFIX, aliased_to); 128 return(0);129 132 } 130 133 … … 150 153 } 151 154 152 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) { 155 /* caller must free the result */ 156 G_GNUC_WARN_UNUSED_RESULT 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) 157 { 153 158 static int alias_recurse_depth = 0; 154 159 int ival=0; … … 223 228 224 229 /* returns a summary line describing this keymap. the caller must free. */ 225 char *owl_cmd_describe(const owl_cmd *cmd) { 230 G_GNUC_WARN_UNUSED_RESULT char *owl_cmd_describe(const owl_cmd *cmd) 231 { 226 232 if (!cmd || !cmd->name || !cmd->summary) return NULL; 227 233 return g_strdup_printf("%-25s - %s", cmd->name, cmd->summary);
Note: See TracChangeset
for help on using the changeset viewer.