Changeset 7ba9e0de

Timestamp:

May 16, 2010, 1:15:15 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

3687413

Parents:

700dc91

git-author:

David Benjamin <davidben@mit.edu> (05/14/10 17:40:48)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:15)

Message:

Define constants for output switches

Remembering 0, 1, and 2 is really just awful.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

commands.c

@@ -1608 +1608 @@
 char *owl_command_exec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 0);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 1);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 2);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 
 char *owl_command_perl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 0);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 1);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 2);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 

functions.c

@@ -1992 +1992 @@
   newbuff = owl_sprintf("%s%s", buff, redirect);
 
-  if (type == 1) {
+  if (type == OWL_OUTPUT_POPUP) {
     owl_popexec_new(newbuff);
   } else {
@@ -1999 +1999 @@
     pclose(p);
     
-    if (type==1) {
+    if (type == OWL_OUTPUT_POPUP) {
       owl_function_popless_text(out);
-    } else if (type==0) {
+    } else if (type == OWL_OUTPUT_RETURN) {
       owl_free(newbuff);
       return out;
-    } else if (type==2) {
+    } else if (type == OWL_OUTPUT_ADMINMSG) {
       owl_function_adminmsg(buff, out);
     } else {
@@ -2034 +2034 @@
   perlout = owl_perlconfig_execute(buff);
   if (perlout) { 
-    if (type==1) {
+    if (type == OWL_OUTPUT_POPUP) {
       owl_function_popless_text(perlout);
-    } else if (type==2) {
+    } else if (type == OWL_OUTPUT_ADMINMSG) {
       owl_function_adminmsg(buff, perlout);
-    } else if (type==0) {
+    } else if (type == OWL_OUTPUT_RETURN) {
       return perlout;
     } else {

owl.h

@@ -184 +184 @@
 #define OWL_VARIABLE_BOOL       2
 #define OWL_VARIABLE_STRING     3
+
+#define OWL_OUTPUT_RETURN       0
+#define OWL_OUTPUT_POPUP        1
+#define OWL_OUTPUT_ADMINMSG     2
 
 #define OWL_FILTER_MAX_DEPTH    300