OSSP CVS Repository

ossp - Check-in [1561]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1561
Date: 2002-Jan-16 17:10:34 (local)
2002-Jan-16 16:10:34 (UTC)
User:rse
Branch:
Comment: code cleanup
Tickets:
Inspections:
Files:
ossp-pkg/val/val.c      1.2 -> 1.3     9 inserted, 13 deleted

ossp-pkg/val/val.c 1.2 -> 1.3

--- val.c        2002/01/16 14:17:56     1.2
+++ val.c        2002/01/16 16:10:34     1.3
@@ -881,20 +881,17 @@
     val_rc_t rc;
     val_apply_ctx_t val_ctx;
 
-fprintf(stderr, "DEBUG: val_apply_internal name=<%s>, prefixlen=%d, depth=%d\n", name, prefixlen, depth);
     if (name[prefixlen] == '\0') {
         /* prefix="foo.bar.", remainder="" */
-        //if (--depth > 0) {
-            val_ctx.val       = val;
-            val_ctx.name      = (char *)name;
-            val_ctx.prefixlen = prefixlen;
-            val_ctx.depth     = depth;
-            val_ctx.cb        = cb;
-            val_ctx.ctx       = ctx;
-            val_ctx.rc        = VAL_OK;
-            if (!lh_apply(val->lh, val_apply_cb, &val_ctx))
-                return VAL_ERR_SYS;
-        //}
+        val_ctx.val       = val;
+        val_ctx.name      = (char *)name;
+        val_ctx.prefixlen = prefixlen;
+        val_ctx.depth     = depth;
+        val_ctx.cb        = cb;
+        val_ctx.ctx       = ctx;
+        val_ctx.rc        = VAL_OK;
+        if (!lh_apply(val->lh, val_apply_cb, &val_ctx))
+            return VAL_ERR_SYS;
     }
     else {
         if ((cp = strchr(name+prefixlen, '.')) != NULL) {
@@ -915,7 +912,6 @@
             /* execute VAL callback */
             if ((rc = cb(ctx, name, (obj->type & ~VAL_INLINE), obj->desc, val_storage(obj))) != VAL_OK)
                 return rc;
-//fprintf(stderr, "DEBUG: depth=%d obj->type=%.8lx\n", depth, obj->type);
             if (obj->type & VAL_TYPE_VAL) {
                 if (depth == 0)
                     return VAL_OK;

CVSTrac 2.0.1