CLEAN: copyrights

yulsfish · May 10, 2016 · 1fe0910 · 1fe0910
1 parent 41917b6
commit 1fe0910
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 6 deletions.
diff --git a/paks/mpr/dist/mpr.h b/paks/mpr/dist/mpr.h
@@ -987,10 +987,10 @@ typedef struct MprFreeQueue {
 #define MPR_MANAGER_OFFSET          1
 #define MPR_MEM_PAD_PTR(mp, offset) ((void*) (((char*) mp) + mp->size - ((offset) * sizeof(void*))))
 #define GET_MANAGER(mp)             ((MprManager) (*(void**) ((MPR_MEM_PAD_PTR(mp, MPR_MANAGER_OFFSET)))))
-#define SET_MANAGER(mp, fn)         if (1) { \
+#define SET_MANAGER(mp, fn)         do { \
                                         *((MprManager*) MPR_MEM_PAD_PTR(mp, MPR_MANAGER_OFFSET)) = fn ; \
                                         mp->hasManager = 1; \
-                                    } else
+                                    } while (0);
 /*
     Manager callback flags
  */
@@ -1698,7 +1698,7 @@ PUBLIC void mprRemoveRoot(cvoid *ptr);
                 } \
                 HINC(marked); \
             } \
-        } else
+        } else {}
 #endif
 
 /*

diff --git a/paks/mpr/dist/mprLib.c b/paks/mpr/dist/mprLib.c
@@ -10563,6 +10563,56 @@ PUBLIC char *mprEscapeSQL(cchar *cmd)
     return result;
 }
 
+#if KEEP
+static void charGen() 
+{
+    uchar    flags;
+    uint     c;
+
+    mprCreate(argc, argv, 0);
+
+    mprPrintf("static uchar charMatch[256] = {\n\t0x00,");
+
+    for (c = 1; c < 256; ++c) {
+        flags = 0;
+        if (c % 16 == 0)
+            mprPrintf("\n\t");
+#if ME_WIN_LIKE
+        if (strchr("&;`'\"|*?~<>^()[]{}$\\\n\r%", c)) {
+            flags |= MPR_ENCODE_SHELL;
+        }
+#else
+        if (strchr("&;`\'\"|*?~<>^()[]{}$\\\n", c)) {
+            flags |= MPR_ENCODE_SHELL;
+        }
+#endif
+
+        if (isalnum((uchar) c) || strchr("-_.~", c)) {
+            /* Acceptable */
+        } else if (strchr("#;,/?:@&=+$", c)) {
+            /* Reserved characters */
+            flags |= MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI_COMPONENT;
+        } else if (strchr("!'()*", c)) {
+            flags |= MPR_ENCODE_URI | MPR_ENCODE_URI_COMPONENT;
+        } else if (strchr("[]", c)) {
+            flags |= MPR_ENCODE_JS_URI | MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI_COMPONENT;
+        } else {
+            /* Matches " ", {, }, |, ^, \, ~, ` */
+            flags |= MPR_ENCODE_URI | MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI | MPR_ENCODE_JS_URI_COMPONENT;
+        }
+        if (strchr("<>&\"'", c) != 0) {
+            flags |= MPR_ENCODE_HTML;
+        }
+        if (strchr("\n\r\\\'\"\032", c) != 0) {
+            flags |= MPR_ENCODE_SQL;
+        }
+        mprPrintf("0x%02x%c", flags, (c < 255) ? ',' : ' ');
+    }
+    mprPrintf("\n};\n");
+}
+#endif
+
+
 
 /*
     Copyright (c) Embedthis Software. All Rights Reserved.

diff --git a/src/mpr/mpr.h b/src/mpr/mpr.h
@@ -987,10 +987,10 @@ typedef struct MprFreeQueue {
 #define MPR_MANAGER_OFFSET          1
 #define MPR_MEM_PAD_PTR(mp, offset) ((void*) (((char*) mp) + mp->size - ((offset) * sizeof(void*))))
 #define GET_MANAGER(mp)             ((MprManager) (*(void**) ((MPR_MEM_PAD_PTR(mp, MPR_MANAGER_OFFSET)))))
-#define SET_MANAGER(mp, fn)         if (1) { \
+#define SET_MANAGER(mp, fn)         do { \
                                         *((MprManager*) MPR_MEM_PAD_PTR(mp, MPR_MANAGER_OFFSET)) = fn ; \
                                         mp->hasManager = 1; \
-                                    } else
+                                    } while (0);
 /*
     Manager callback flags
  */
@@ -1698,7 +1698,7 @@ PUBLIC void mprRemoveRoot(cvoid *ptr);
                 } \
                 HINC(marked); \
             } \
-        } else
+        } else {}
 #endif
 
 /*

diff --git a/src/mpr/mprLib.c b/src/mpr/mprLib.c
@@ -10563,6 +10563,56 @@ PUBLIC char *mprEscapeSQL(cchar *cmd)
     return result;
 }
 
+#if KEEP
+static void charGen() 
+{
+    uchar    flags;
+    uint     c;
+
+    mprCreate(argc, argv, 0);
+
+    mprPrintf("static uchar charMatch[256] = {\n\t0x00,");
+
+    for (c = 1; c < 256; ++c) {
+        flags = 0;
+        if (c % 16 == 0)
+            mprPrintf("\n\t");
+#if ME_WIN_LIKE
+        if (strchr("&;`'\"|*?~<>^()[]{}$\\\n\r%", c)) {
+            flags |= MPR_ENCODE_SHELL;
+        }
+#else
+        if (strchr("&;`\'\"|*?~<>^()[]{}$\\\n", c)) {
+            flags |= MPR_ENCODE_SHELL;
+        }
+#endif
+
+        if (isalnum((uchar) c) || strchr("-_.~", c)) {
+            /* Acceptable */
+        } else if (strchr("#;,/?:@&=+$", c)) {
+            /* Reserved characters */
+            flags |= MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI_COMPONENT;
+        } else if (strchr("!'()*", c)) {
+            flags |= MPR_ENCODE_URI | MPR_ENCODE_URI_COMPONENT;
+        } else if (strchr("[]", c)) {
+            flags |= MPR_ENCODE_JS_URI | MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI_COMPONENT;
+        } else {
+            /* Matches " ", {, }, |, ^, \, ~, ` */
+            flags |= MPR_ENCODE_URI | MPR_ENCODE_URI_COMPONENT | MPR_ENCODE_JS_URI | MPR_ENCODE_JS_URI_COMPONENT;
+        }
+        if (strchr("<>&\"'", c) != 0) {
+            flags |= MPR_ENCODE_HTML;
+        }
+        if (strchr("\n\r\\\'\"\032", c) != 0) {
+            flags |= MPR_ENCODE_SQL;
+        }
+        mprPrintf("0x%02x%c", flags, (c < 255) ? ',' : ' ');
+    }
+    mprPrintf("\n};\n");
+}
+#endif
+
+
 
 /*
     Copyright (c) Embedthis Software. All Rights Reserved.