Reduce scope

diff --git a/c/cmd/lib/stdinread.c b/c/cmd/lib/stdinread.c
index 4fb4ad5becdfc764a436f75ef536436645848130def6ba5383ffa1f539cc75a2..bc570b7ad40b5c39eae24f3fd09a7dc118aa5f830c8e1389ecf5e1f9c3d4a2f0 100644 (file)
--- a/c/cmd/lib/stdinread.c
+++ b/c/cmd/lib/stdinread.c
@@ -14,8 +14,7 @@ stdinread(unsigned char **buf, size_t *len, size_t *cap)
         return false;
     }
     *len = 0;
-    ssize_t n = 0;
-    for (;;) {
+    for (ssize_t n = 0;;) {
         errno = 0;
         n = read(STDIN_FILENO, *buf + *len, *cap - *len);
         if (n == -1) {

diff --git a/c/lib/items.c b/c/lib/items.c
index 37cebaeaed669b49a61d79ff932413d16457f5f510c63f0c68d7f6fc9807444a..10d23c903f0ec7f9ed0564c224da4f75ee36a1d424f839f0863e2fb33c6350cd 100644 (file)
--- a/c/lib/items.c
+++ b/c/lib/items.c
@@ -175,9 +175,8 @@ keksItemsParse( // NOLINT(misc-no-recursion)
         items->list[item].atom.v.list.head = item + 1;
         items->list[item].atom.v.list.len = 0;
         size_t prev = 0;
-        size_t cur = 0;
         size_t idx = item;
-        for (;;) {
+        for (size_t cur = 0;;) {
             err = keksItemsParse(items, off, buf, len, true, recursionDepth + 1);
             if (err != KEKSErrNo) {
                 return err;
@@ -205,10 +204,9 @@ keksItemsParse( // NOLINT(misc-no-recursion)
         items->list[item].atom.v.list.len = 0;
         size_t idx = item;
         size_t prev = 0;
-        size_t cur = 0;
         size_t prevKeyLen = 0;
         const unsigned char *prevKey = NULL;
-        for (;;) {
+        for (size_t cur = 0;;) {
             err = keksItemsParse(items, off, buf, len, false, recursionDepth + 1);
             if (err != KEKSErrNo) {
                 return err;
@@ -267,14 +265,13 @@ keksItemsParse( // NOLINT(misc-no-recursion)
         const size_t chunkLen = items->list[item].atom.v.blob.chunkLen;
         size_t idx = item;
         size_t prev = 0;
-        size_t cur = 0;
         bool eoc = false;
         while (!eoc) {
             err = keksItemsParse(items, off, buf, len, false, recursionDepth + 1);
             if (err != KEKSErrNo) {
                 return err;
             }
-            cur = idx + 1;
+            size_t cur = idx + 1;
             struct KEKSAtom *atom = &(items->list[cur].atom);
             if (atom->typ != KEKSItemBin) {
                 return KEKSErrBlobBadAtom;
@@ -427,7 +424,6 @@ KEKSItemsEncode( // NOLINT(misc-no-recursion)
                 return false;
             }
             (*off) += got;
-            continue;
         }
         assert(cap >= (*off));
         ok = KEKSAtomBinEncode(

diff --git a/c/lib/schema.c b/c/lib/schema.c
index 88ef1ee9d76b1bcf8ae7de9fb4438a33f6658a44d437ea0730d951e8f9daa743..304cc81ec7038a4b49ce05324f2debd58adf89704fff752bf1af1df93fa1372b 100644 (file)
--- a/c/lib/schema.c
+++ b/c/lib/schema.c
@@ -653,14 +653,13 @@ KEKSSchemaValidate( // NOLINT(misc-no-recursion)
     size_t taken = idxData;
     bool eachInList = false;
     bool eachInMap = false;
-    struct KEKSSchemaErr errCmd;
     while (idxSchema != 0) {
         if (schema->list[idxSchema].atom.typ != KEKSItemList) {
             err.code = KEKSSchemaErrInvalidSchema;
             err.msg = "non-list cmds";
             return err;
         }
-        errCmd = keksSchemaCmd(
+        struct KEKSSchemaErr errCmd = keksSchemaCmd(
             &taken, &eachInList, &eachInMap, schema, data, idxSchema, idxData);
         if (errCmd.code != KEKSSchemaErrNo) {
             return errCmd;