summaryrefslogtreecommitdiff
path: root/src/schema/schema_project.c
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@wiredtiger.com>2011-07-21 14:33:38 -0400
committerKeith Bostic <keith.bostic@wiredtiger.com>2011-07-21 14:33:38 -0400
commitda41b154fe3466dd5f25c184fa7b38b38d074dc8 (patch)
tree9edf48372fc2a115c14820401eeca9caf865601b /src/schema/schema_project.c
parentbfc2fa122e3fcdcfcd465bcc2fb57dd83f3fca27 (diff)
downloadmongo-da41b154fe3466dd5f25c184fa7b38b38d074dc8.tar.gz
Re-work WT_ASSERT/WT_FAILURE to support printf-style arguments and optional
returns.
Diffstat (limited to 'src/schema/schema_project.c')
-rw-r--r--src/schema/schema_project.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/schema/schema_project.c b/src/schema/schema_project.c
index 403ab11fc2f..a8e34183ac5 100644
--- a/src/schema/schema_project.c
+++ b/src/schema/schema_project.c
@@ -98,7 +98,10 @@ __wt_schema_project_in(WT_SESSION_IMPL *session,
break;
default:
- WT_FAILURE(session, NULL);
+ WT_FAILURE(session,
+ "unexpected projection plan: %c",
+ (int)*proj);
+ return (0);
}
}
}
@@ -240,7 +243,6 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session,
(const uint8_t **)&vp,
(size_t)(vend - vp)));
/* FALLTHROUGH */
-
case WT_PROJ_REUSE:
/*
* There is subtlety here: the value format
@@ -264,9 +266,10 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session,
&pv, &p, (size_t)(end - p)));
buf->size += (uint32_t)len;
break;
-
default:
- WT_FAILURE(session, NULL);
+ WT_FAILURE(session,
+ "unexpected projection plan: %c",
+ (int)*proj);
}
}
}