Changeset 7d969f3 for zephyr.c

Timestamp:

Mar 6, 2011, 2:14:52 PM (14 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

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

Children:

41f0cf3

Parents:

c518676

git-author:

Karl Ramm <kcr@1ts.org> (02/12/11 00:03:19)

git-committer:

Karl Ramm <kcr@1ts.org> (03/06/11 14:14:52)

Message:

refactor owl_zephyr_zlog_in and report errors in owl_zephyr_zlog_{in,out}

Use the function ZParseExposureLevel thoughtfully provided by the library,
and see what happens when we actually report errors that occur here.

Reviewed-By: Nelson Elhage <nelhage@nelhage.com>

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -1027 +1027 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  const char *exposure, *eset;
-  int ret;
+  char *exposure, *eset;
+  Code_t ret;
 
   ZResetAuthentication();
-    
-  eset=EXPOSE_REALMVIS;
-  exposure=ZGetVariable(zstr("exposure"));
-  if (exposure==NULL) {
-    eset=EXPOSE_REALMVIS;
-  } else if (!strcasecmp(exposure,EXPOSE_NONE)) {
-    eset = EXPOSE_NONE;
-  } else if (!strcasecmp(exposure,EXPOSE_OPSTAFF)) {
-    eset = EXPOSE_OPSTAFF;
-  } else if (!strcasecmp(exposure,EXPOSE_REALMVIS)) {
-    eset = EXPOSE_REALMVIS;
-  } else if (!strcasecmp(exposure,EXPOSE_REALMANN)) {
-    eset = EXPOSE_REALMANN;
-  } else if (!strcasecmp(exposure,EXPOSE_NETVIS)) {
-    eset = EXPOSE_NETVIS;
-  } else if (!strcasecmp(exposure,EXPOSE_NETANN)) {
-    eset = EXPOSE_NETANN;
-  }
+
+  eset = EXPOSE_REALMVIS;
+  exposure = ZGetVariable(zstr("exposure"));
+  if (exposure)
+    exposure = ZParseExposureLevel(exposure);
+  if (exposure)
+    eset = exposure;
    
-  ret=ZSetLocation(zstr(eset));
-  if (ret != ZERR_NONE) {
-    /*
-      owl_function_makemsg("Error setting location: %s", error_message(ret));
-    */
-  }
+  ret = ZSetLocation(eset);
+  if (ret != ZERR_NONE)
+    owl_function_error("Error setting location: %s", error_message(ret));
 #endif
 }
@@ -1062 +1048 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  int ret;
+  Code_t ret;
 
   ZResetAuthentication();
-  ret=ZUnsetLocation();
-  if (ret != ZERR_NONE) {
-    /*
-      owl_function_makemsg("Error unsetting location: %s", error_message(ret));
-    */
-  }
+  ret = ZUnsetLocation();
+  if (ret != ZERR_NONE)
+    owl_function_error("Error unsetting location: %s", error_message(ret));
 #endif
 }