diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-02-25 18:36:49 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-02-25 18:55:26 +0100 |
| commit | 99b7c46d0297663d8a908a42ce137d04221a4e31 (patch) | |
| tree | 0c042100aed8ca6d51170b4323c606ad77f6edad /output/sqlite3 | |
| parent | a99693efa30139c7d5ce42cdb32618fe24b99234 (diff) | |
sqlite3: cleanup error handling of sqlite3_bind_int() in sqlite3_interp()
Move error handling after the switch statement since it's the same
for all cases, we save several lines of code.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'output/sqlite3')
| -rw-r--r-- | output/sqlite3/ulogd_output_SQLITE3.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c index 65e320b..d9ebe9d 100644 --- a/output/sqlite3/ulogd_output_SQLITE3.c +++ b/output/sqlite3/ulogd_output_SQLITE3.c @@ -158,70 +158,54 @@ sqlite3_interp(struct ulogd_pluginstance *pi) switch (f->key->type) { case ULOGD_RET_INT8: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.i8); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_INT16: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.i16); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_INT32: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.i32); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_INT64: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.i64); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_UINT8: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.ui8); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_UINT16: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.ui16); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_UINT32: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.ui32); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_IPADDR: case ULOGD_RET_UINT64: ret = sqlite3_bind_int64(priv->p_stmt, i, k_ret->u.value.ui64); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_BOOL: ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.b); - if (ret != SQLITE_OK) - goto err_bind; break; case ULOGD_RET_STRING: ret = sqlite3_bind_text(priv->p_stmt, i, k_ret->u.value.ptr, strlen(k_ret->u.value.ptr), SQLITE_STATIC); - if (ret != SQLITE_OK) - goto err_bind; break; default: + ret = SQLITE_OK; ulogd_log(ULOGD_NOTICE, "unknown type %d for %s\n", f->key->type, f->key->name); } + if (ret != SQLITE_OK) + goto err_bind; + i++; } |