fixed coding style

Wiphone · Sep 15, 2013 · 1956f28 · 1956f28
1 parent bd5601d
commit 1956f28
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/CHANGES.te b/CHANGES.te
@@ -17,8 +17,8 @@ Changes with Tengine 1.5.1                                       29 Aug 2013
     *) Bugfix: fixed a compile error when using the configure option
        '--without-dso'. (zhuzhaoyuan)
 
-    *) Bugfix: fixed two compile warnings. (zzjin, diwayou) 
-      
+    *) Bugfix: fixed two compile warnings. (zzjin, diwayou)
+
 
 Changes with Tengine 1.5.0                                       31 Jul 2013
 
@@ -76,7 +76,7 @@ Changes with Tengine 1.4.4                                       21 Mar 2013
        can be always served by the same upstream server. (dinic)
 
     *) Feature: now the sysguard module can protect the server based on
-       the amount of free memory. (lifeibo) 
+       the amount of free memory. (lifeibo)
 
     *) Feature: added support for geoip regional database in geoip module.
        (jasonlfunk)
@@ -97,7 +97,7 @@ Changes with Tengine 1.4.4                                       21 Mar 2013
     *) Bugfix: fixed a bug with TFS module that it might corrupt large files.
        (zhcn381)
 
- 
+
 Changes with Tengine 1.4.3                                       21 Jan 2013
 
     *) Feature: added the TFS module which provides a RESTful API to Taobao
@@ -123,7 +123,7 @@ Changes with Tengine 1.4.3                                       21 Jan 2013
 
     *) Bugfix: fixed the bug that sysguard module didn't work on Mac OS. (lizi)
 
- 
+
 Changes with Tengine 1.4.2                                         22 Nov 2012
 
     *) Feature: added the option '--dso-tool-path' to configure script, which
@@ -158,7 +158,7 @@ Changes with Tengine 1.4.2                                         22 Nov 2012
     *) Bugfix: fixed the installation directory error with the DSO module
        when creating the RPM package. (monadbobo)
        Thanks to Jianbin Xiao and Ren Xiaolei.
-      
+
 
 Changes with Tengine 1.4.1                                         10 Oct 2012
 

diff --git a/src/http/modules/lua/ngx_http_lua_logby.c b/src/http/modules/lua/ngx_http_lua_logby.c
@@ -43,8 +43,8 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /**
      * we want to create empty environment for current script
      *
-	 * newt = {}
-	 * newt["_G"] = newt
+     * newt = {}
+     * newt["_G"] = newt
      * setmetatable(newt, {__index = _G})
      *
      * if a function or symbol is not defined in our env, __index will lookup

diff --git a/src/http/modules/ngx_http_trim_filter_module.c b/src/http/modules/ngx_http_trim_filter_module.c
@@ -642,7 +642,7 @@ ngx_http_trim_parse(ngx_http_request_t *r, ngx_buf_t *buf,
             break;
 
         case trim_state_tag_textarea_begin:
-            look = ngx_http_trim_textarea.data[ctx->looked++];    /* <textarea> */
+            look = ngx_http_trim_textarea.data[ctx->looked++]; /* <textarea> */
             if (ch == look) {
                 if (ctx->looked == ngx_http_trim_textarea.len) {
                     ctx->state = trim_state_tag_textarea_end;
@@ -1009,7 +1009,7 @@ ngx_http_trim_parse(ngx_http_request_t *r, ngx_buf_t *buf,
 
                     } else {
                         ctx->state = trim_state_tag_style_end;
-                    } 
+                    }
 
                     ctx->looked = 0;
                 }
@@ -1192,7 +1192,9 @@ ngx_http_trim_parse(ngx_http_request_t *r, ngx_buf_t *buf,
             case '/':
                 ctx->state = trim_state_tag_style_css_text;
 
-                if ((size_t) (read - buf->pos) >= ngx_http_trim_saved_jscss.len) {
+                if ((size_t) (read - buf->pos)
+                     >= ngx_http_trim_saved_jscss.len) {
+
                     write = ngx_cpymem(write, ngx_http_trim_saved_jscss.data,
                                        ngx_http_trim_saved_jscss.len);
 
@@ -1228,7 +1230,9 @@ ngx_http_trim_parse(ngx_http_request_t *r, ngx_buf_t *buf,
             case '/':
                 ctx->state = trim_state_tag_style_css_comment_hack_text;
 
-                if ((size_t) (read - buf->pos) >= ngx_http_trim_saved_css_hack.len) {
+                if ((size_t) (read - buf->pos)
+                     >= ngx_http_trim_saved_css_hack.len) {
+
                     write = ngx_cpymem(write, ngx_http_trim_saved_css_hack.data,
                                        ngx_http_trim_saved_css_hack.len);
 

diff --git a/src/http/ngx_http_upstream_check_module.c b/src/http/ngx_http_upstream_check_module.c
@@ -586,7 +586,17 @@ static ngx_check_conf_t  ngx_check_types[] = {
       1,
       0 },
 
-    { 0, ngx_null_string, ngx_null_string, 0, NULL, NULL, NULL, NULL, NULL, 0, 0 }
+    { 0,
+      ngx_null_string,
+      ngx_null_string,
+      0,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      0,
+      0 }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -586,7 +586,17 @@ static ngx_check_conf_t ngx_check_types[] = { @@
 ,
 },
-        { 0, ngx_null_string, ngx_null_string, 0, NULL, NULL, NULL, NULL, NULL, 0, 0 }
+        { 0,
+          ngx_null_string,
+          ngx_null_string,
+,
+          NULL,
+          NULL,
+          NULL,
+          NULL,
+          NULL,
+,
+}
     };
@@ Expand Down @@