Changeset 1971b59

Timestamp:

Mar 18, 2004, 9:43:40 AM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f84bca8

Parents:

1bb1e67

Message:

Consistified function format
Put dashes in the version number

Files:

• owl.h (modified) (1 diff)
• popexec.c (modified) (3 diffs)
• zephyr.c (modified) (1 diff)

owl.h

@@ -59 +59 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.6pre1
-#define OWL_VERSION_STRING "2.1.6pre1"
+#define OWL_VERSION         2.1.6-pre-1
+#define OWL_VERSION_STRING "2.1.6-pre-1"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

popexec.c

@@ -90 +90 @@
 }
 
-void owl_popexec_inputhandler(int handle, int fd, int eventmask, void *data) {
+void owl_popexec_inputhandler(int handle, int fd, int eventmask, void *data)
+{
   owl_popexec *pe = (owl_popexec*)data;
   int navail, bread, rv_navail;
@@ -165 +166 @@
 }
 
-void owl_popexec_viewwin_onclose(owl_viewwin *vwin, void *data) {
+void owl_popexec_viewwin_onclose(owl_viewwin *vwin, void *data)
+{
   owl_popexec *pe = (owl_popexec*)data;
   int status, rv;
@@ -186 +188 @@
 }
 
-void owl_popexec_unref(owl_popexec *pe) {
+void owl_popexec_unref(owl_popexec *pe)
+{
   owl_function_debugmsg("unref of %p was %d", pe, pe->refcount);
   pe->refcount--;

zephyr.c

@@ -848 +848 @@
 char *long_zuser(char *in)
 {
-  char *ptr;
-
-  if (NULL != (ptr=strchr(in, '@'))) {
-    return owl_strdup(in);
-  } else {
-    return owl_sprintf("%s@%s", in, owl_zephyr_get_realm());
-  }
-}
-
+  if (strchr(in, '@')) {
+    return(owl_strdup(in));
+  }
+  return(owl_sprintf("%s@%s", in, owl_zephyr_get_realm()));
+}
 
 /* strip out the instance from a zsender's principal.  Preserves the