str invalid

Chrono Law · Chrono Law · commit 968b8813d611 · 2015-11-16T19:31:16.000+08:00
diff --git a/ngxpp/NgxValue.hpp b/ngxpp/NgxValue.hpp
@@ -80,13 +80,19 @@ class NgxValue final
         }
     }
 
-    static void merge(ngx_str_t& c, const ngx_str_t& p, const ngx_str_t& d)
+public:
+    static bool invalid(const ngx_str_t& v)
     {
-        if(!c.data)
-        {
-            c = p.data ? p : d;
-        }
+        return !v.data || !v.len;
     }
+
+    //static void merge(ngx_str_t& c, const ngx_str_t& p, const ngx_str_t& d)
+    //{
+    //    if(!c.data)
+    //    {
+    //        c = p.data ? p : d;
+    //    }
+    //}
 };
 
 #endif  //_NGX_VALUE_HPP

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,19 @@ class NgxValue final`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- static void merge(ngx_str_t& c, const ngx_str_t& p, const ngx_str_t& d)`
	`83`	`+public:`
	`84`	`+ static bool invalid(const ngx_str_t& v)`
`84`	`85`	`{`
`85`		`- if(!c.data)`
`86`		`- {`
`87`		`- c = p.data ? p : d;`
`88`		`- }`
	`86`	`+ return !v.data \|\| !v.len;`
`89`	`87`	`}`
	`88`	`+`
	`89`	`+ //static void merge(ngx_str_t& c, const ngx_str_t& p, const ngx_str_t& d)`
	`90`	`+ //{`
	`91`	`+ // if(!c.data)`
	`92`	`+ // {`
	`93`	`+ // c = p.data ? p : d;`
	`94`	`+ // }`
	`95`	`+ //}`
`90`	`96`	`};`
`91`	`97`
`92`	`98`	`#endif //_NGX_VALUE_HPP`