summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-07 15:15:57 +0200
committerMichael Adam <obnox@samba.org>2008-04-10 01:28:56 +0200
commitec12f0a25aaf7fca5417a7fe6f3c6182c41d80a0 (patch)
treefc20730b77f2c72ae3daee0b946328afdebab16b
parent3c40c2d7d32ae7db064a7f44da9e736efc7936bb (diff)
downloadsamba-ec12f0a25aaf7fca5417a7fe6f3c6182c41d80a0.tar.gz
samba-ec12f0a25aaf7fca5417a7fe6f3c6182c41d80a0.tar.bz2
samba-ec12f0a25aaf7fca5417a7fe6f3c6182c41d80a0.zip
libsmbconf: untangle assignment and test in for-loop condition.
Michael (This used to be commit 4339caff09e1277ae33d3810043bcb3f4e7c4e45)
-rw-r--r--source3/lib/smbconf/smbconf_reg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index b40c37e60e..f25382769d 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -342,8 +342,8 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
}
for (count = 0;
- W_ERROR_IS_OK(werr = reg_enumvalue(tmp_ctx, key, count, &valname,
- &valvalue));
+ werr = reg_enumvalue(tmp_ctx, key, count, &valname, &valvalue),
+ W_ERROR_IS_OK(werr);
count++)
{
char *valstring;
@@ -562,8 +562,8 @@ static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
}
for (count = 0;
- W_ERROR_IS_OK(werr = reg_enumkey(tmp_ctx, key, count,
- &subkey_name, NULL));
+ werr = reg_enumkey(tmp_ctx, key, count, &subkey_name, NULL),
+ W_ERROR_IS_OK(werr);
count++)
{
if (strequal(subkey_name, GLOBAL_NAME)) {