Changeset aad166a

Timestamp:

Jun 19, 2011, 1:49:34 AM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

117c21c

Parents:

ea68035

git-author:

Anders Kaseorg <andersk@mit.edu> (06/18/11 20:40:55)

git-committer:

Anders Kaseorg <andersk@mit.edu> (06/19/11 01:49:34)

Message:

commands_to_init: Move into new function owl_cmd_add_defaults

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

Files:

• cmd.c (modified) (2 diffs)
• commands.c (modified) (2 diffs)

cmd.c

@@ -5 +5 @@
 #include "owl.h"
 
-extern const owl_cmd commands_to_init[];
-
 /**************************************************************************/
 /***************************** COMMAND DICT *******************************/
@@ -13 +11 @@
 int owl_cmddict_setup(owl_cmddict *cd) {
   owl_cmddict_init(cd);
-  if (0 != owl_cmddict_add_from_list(cd, commands_to_init)) return(-1);
-  return(0);
+  return owl_cmd_add_defaults(cd);
 }
 

commands.c

@@ -41 +41 @@
 
 
-const owl_cmd commands_to_init[]
-  = {
+int owl_cmd_add_defaults(owl_cmddict *cd)
+{
+  owl_cmd commands_to_init[] = {
+
   OWLCMD_ARGS("zlog", owl_command_zlog, OWL_CTX_ANY,
               "send a login or logout notification",
@@ -1037 +1039 @@
   { NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
-};
+  };
+
+  return owl_cmddict_add_from_list(cd, commands_to_init);
+}
 
 void owl_command_info(void)