Relayouted all switch statements: case aligns with switch.

[mmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index c365470..13ab153 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -207,44 +207,41 @@ find_cache(CT ct, int policy, int *writing, char *id, char *buffer, int buflen)
                                writing ? "writing" : "reading", id);
 
        switch (policy) {
                                writing ? "writing" : "reading", id);
 
        switch (policy) {

-               case CACHE_NEVER:
-               default:
-                       break;
+       case CACHE_NEVER:
+       default:
+               break;

 
 

-               case CACHE_ASK:
-               case CACHE_PUBLIC:
-                       if (cache_private && !writing &&
-                                       find_cache_aux(writing ? 2 : 0,
-                                       cache_private, id, buffer, buflen)
-                                       == OK) {
-                               if (access(buffer, R_OK) != NOTOK) {
+       case CACHE_ASK:
+       case CACHE_PUBLIC:
+               if (cache_private && !writing &&
+                               find_cache_aux(writing ? 2 : 0,
+                               cache_private, id, buffer, buflen) == OK) {
+                       if (access(buffer, R_OK) != NOTOK) {

 got_private:
 got_private:

-                                       if (writing)
-                                               *writing = 1;
+                               if (writing)
+                                       *writing = 1;

 got_it:
 got_it:

-                                       status = OK;
-                                       break;
-                               }
+                               status = OK;
+                               break;

                        }
                        }

-                       if (cache_public && find_cache_aux(writing ? 1 : 0,
-                                       cache_public, id, buffer, buflen)
-                                       == OK) {
-                               if (writing || access(buffer, R_OK) != NOTOK) {
-                                       if (writing)
-                                               *writing = 0;
-                                       goto got_it;
-                               }
+               }
+               if (cache_public && find_cache_aux(writing ? 1 : 0,
+                               cache_public, id, buffer, buflen) == OK) {
+                       if (writing || access(buffer, R_OK) != NOTOK) {
+                               if (writing)
+                                       *writing = 0;
+                               goto got_it;

                        }
                        }

-                       break;
+               }
+               break;

 
 

-               case CACHE_PRIVATE:
-                       if (cache_private && find_cache_aux(writing ? 2 : 0,
-                                       cache_private, id, buffer, buflen)
-                                       == OK) {
-                               if (writing || access(buffer, R_OK) != NOTOK)
-                                       goto got_private;
-                       }
-                       break;
+       case CACHE_PRIVATE:
+               if (cache_private && find_cache_aux(writing ? 2 : 0,
+                               cache_private, id, buffer, buflen) == OK) {
+                       if (writing || access(buffer, R_OK) != NOTOK)
+                               goto got_private;
+               }
+               break;

 
        }
 
 
        }
 

@@ -415,39 +412,41 @@ find_cache_aux2(char *mapfile, char *id, char *mapname, int namelen)
                char *cp, *dp;
 
                switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {
                char *cp, *dp;
 
                switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {

-                       case FLD:
-                       case FLDPLUS:
-                       case FLDEOF:
-                               strncpy(mapname, name, namelen);
-                               if (state != FLDPLUS)
-                                       cp = buf;
-                               else {
-                                       cp = getcpy(buf);
-                                       while (state == FLDPLUS) {
-                                               state = m_getfld(state, name, buf, sizeof(buf), fp);
-                                               cp = add(buf, cp);
-                                       }
+               case FLD:
+               case FLDPLUS:
+               case FLDEOF:
+                       strncpy(mapname, name, namelen);
+                       if (state != FLDPLUS)
+                               cp = buf;
+                       else {
+                               cp = getcpy(buf);
+                               while (state == FLDPLUS) {
+                                       state = m_getfld(state, name, buf,
+                                                       sizeof(buf), fp);
+                                       cp = add(buf, cp);

                                }
                                }

-                               dp = trimcpy(cp);
-                               if (cp != buf)
-                                       free(cp);
-                               if (debugsw)
-                                       fprintf(stderr, "compare %s to %s <- %s\n", id, dp, mapname);
-                               result = strcmp(id, dp);
-                               free(dp);
-                               if (result == 0) {
-                                       lkfclose(fp, mapfile);
-                                       return OK;
-                               }
-                               if (state != FLDEOF)
-                                       continue;
-                               /* else fall... */
-
-                       case BODY:
-                       case BODYEOF:
-                       case FILEEOF:
-                       default:
-                               break;
+                       }
+                       dp = trimcpy(cp);
+                       if (cp != buf)
+                               free(cp);
+                       if (debugsw)
+                               fprintf(stderr, "compare %s to %s <- %s\n",
+                                               id, dp, mapname);
+                       result = strcmp(id, dp);
+                       free(dp);
+                       if (result == 0) {
+                               lkfclose(fp, mapfile);
+                               return OK;
+                       }
+                       if (state != FLDEOF)
+                               continue;
+                       /* else fall... */
+
+               case BODY:
+               case BODYEOF:
+               case FILEEOF:
+               default:
+                       break;

                }
                break;
        }
                }
                break;
        }