Changeset 6ea3890b92add2d38b6907fc33d3ac71ab76db92

Timestamp:

10/17/09 18:08:20 (5 weeks ago)

Author:

Karl Ramm <kcr@1ts.org>

git-author:

Karl Ramm <kcr@1ts.org> / 2009-10-16T11:21:14Z-0400

Parents:

b7ee89b6aff39095119c5766ae324557759a7552

Children:

99cc3dceec1bb97699f4e130556ce22975e39b6f

git-committer:

Karl Ramm <kcr@1ts.org> / 2009-10-17T18:08:20Z-0400

Message:

helper function owl_zephyr_dotfile and refactor to use it

There were the ~same four lines of code in many different places,
so I stuck them in a function.

Files:

• zephyr.c (modified) (8 diffs)

zephyr.c

@@ -19 +19 @@
 
 #define HM_SVC_FALLBACK         htons((unsigned short) 2104)
+
+static char *owl_zephyr_dotfile(const char *name, const char *input)
+{
+  if (input != NULL)
+    return owl_strdup(input);
+  else
+    return owl_sprintf("%s/%s", owl_global_get_homedir(&g), name);
+}
 
 #ifdef HAVE_LIBZEPHYR
@@ -254 +262 @@
 
   subs = owl_malloc(sizeof(ZSubscription_t) * subSize);
-  if (filename == NULL)
-    subsfile = owl_sprintf("%s/.zephyr.subs", owl_global_get_homedir(&g));
-  else
-    subsfile = owl_strdup(filename);
+  subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
   if (stat(subsfile, &statbuff) != 0) {
@@ -373 +378 @@
 
   subs = owl_malloc(numSubs * sizeof(ZSubscription_t));
-
-  if (filename==NULL)
-    subsfile = owl_sprintf("%s/%s", owl_global_get_homedir(&g), ".anyone");
-  else
-    subsfile = owl_strdup(filename);
+  subsfile = owl_zephyr_dotfile(".anyone", filename);
 
   if (stat(subsfile, &statbuff) == -1)
@@ -957 +958 @@
 
   line = owl_zephyr_makesubline(class, inst, recip);
-
-  if (filename == NULL)
-    subsfile = owl_sprintf("%s/.zephyr.subs", owl_global_get_homedir(&g));
-  else
-    subsfile = owl_strdup(filename);
+  subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
   /* if the file already exists, check to see if the sub is already there */
@@ -1000 +997 @@
   line[strlen(line)-1]='\0';
 
-  if (!filename) {
-    subsfile=owl_sprintf("%s/.zephyr.subs", owl_global_get_homedir(&g));
-  } else {
-    subsfile=owl_strdup(filename);
-  }
+  subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
   
   linesdeleted = owl_util_file_deleteline(subsfile, line, 1);
@@ -1079 +1072 @@
   FILE *file;
   
-  filename=owl_sprintf("%s/.anyone", owl_global_get_homedir(&g));
-  file=fopen(filename, "a");
+  filename = owl_zephyr_dotfile(".anyone", NULL);
+  file = fopen(filename, "a");
   owl_free(filename);
   if (!file) {
@@ -1094 +1087 @@
   char *filename;
 
-  filename=owl_sprintf("%s/.anyone", owl_global_get_homedir(&g));
+  filename = owl_zephyr_dotfile(".anyone", NULL);
   owl_util_file_deleteline(filename, name, 0);
   owl_free(filename);
@@ -1278 +1271 @@
   FILE *f;
 
-  if (filename == NULL)
-    ourfile = owl_sprintf("%s/.anyone", owl_global_get_homedir(&g));
-  else
-    ourfile = owl_strdup(filename);
+  ourfile = owl_zephyr_dotfile(".anyone", filename);
 
   f = fopen(ourfile, "r");