Compatibility: changed for issues/27 that ngx_vhost_traffic_status_gr…

…oup_to_string() macro is an error when using -Wstring-plus-int at clang compiler.
vozlt · Nov 22, 2015 · d6b04f9 · d6b04f9
1 parent e96b9ce
commit d6b04f9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ngx_http_vhost_traffic_status_module.c b/src/ngx_http_vhost_traffic_status_module.c
@@ -17,6 +17,8 @@
 #define NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC          3
 #define NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG          4
 
+#define NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAMS            (u_char *) "NO\0UA\0UG\0CC\0FG\0"
+
 #define NGX_HTTP_VHOST_TRAFFIC_STATUS_NODE_NONE            0
 #define NGX_HTTP_VHOST_TRAFFIC_STATUS_NODE_FIND            1
 
@@ -337,8 +339,8 @@
 
 #define ngx_vhost_traffic_status_group_to_string(n) (u_char *) (               \
     (n > 4)                                                                    \
-    ? "NO\0"                                                                   \
-    : "NO\0UA\0UG\0CC\0FG\0" + 3 * n                                           \
+    ? NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAMS                                  \
+    : NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAMS + 3 * n                          \
 )
 
 #define ngx_vhost_traffic_status_max_integer (NGX_ATOMIC_T_LEN < 12)           \