webroar 0.4.0 → 0.5.0

data/src/head/wr_application.c

@@ -91,8 +91,12 @@ void wr_app_add_error_msg(wr_app_t* app){
     scgi_header_add(app->ctl->scgi, "STATUS", strlen("STATUS"), "ERROR", strlen("ERROR"));
     err_msg_len = sprintf(err_msg,"The application could not be started due to the following error. Please refer '/var/log/webroar/%s.log' and the application log file for more details.", app->conf->name.str);
     scgi_body_add(app->ctl->scgi, err_msg, err_msg_len);
-    wr_ctl_resp_write(app->ctl);        
+    wr_ctl_resp_write(app->ctl);
+    LOG_ERROR(SEVERE, "%s", err_msg);
+  }else {
+    LOG_ERROR(SEVERE, "Some problem occurred while starting Application %s.", app->conf->name.str);
   }
+  
   app->timeout_counter = 0;
   app->ctl = NULL; 
 }

data/src/head/wr_configurator.c

@@ -70,28 +70,28 @@ int wr_app_conf_req_set(config_application_list_t *app, node_t *app_node){
   if(!wr_string_is_empty(app->baseuri))
     scgi_header_add(app->scgi, "BASE_URI", strlen("BASE_URI"), app->baseuri.str, app->baseuri.len);
  
-  str = wr_validate_string(get_node_value(app_node->child, "type"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "type"));
   scgi_header_add(app->scgi, "TYPE", strlen("TYPE"), str, strlen(str));
     
-  str = wr_validate_string(get_node_value(app_node->child, "analytics"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "analytics"));
   scgi_header_add(app->scgi, "ANALYTICS", strlen("ANALYTICS"), str, strlen(str));
   
-  str = wr_validate_string(get_node_value(app_node->child, "run_as_user"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "run_as_user"));
   scgi_header_add(app->scgi, "USER", strlen("USER"), str, strlen(str));
 
   // Set application environment
-  str = wr_validate_string(get_node_value(app_node->child, "environment"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "environment"));
   if(str){
     scgi_header_add(app->scgi, "ENV", strlen("ENV"), str, strlen(str));
   }else{
     scgi_header_add(app->scgi, "ENV", strlen("ENV"), Config->Application.Default.env.str, Config->Application.Default.env.len);
   }
   
-  node_t *nodes = get_nodes(app_node->child, "environment_variables/set_env");
+  node_t *node = yaml_get_node(app_node->child, "environment_variables/*");
   wr_str_t val;
   wr_string_null(val);
-  while(nodes){
-    str = wr_validate_string(NODE_VALUE(nodes));
+  while(node){
+    str = yaml_validate_string(node->key);
     if(str){      
       if(wr_string_is_empty(val)){
         wr_string_new(val, str, strlen(str));
@@ -100,7 +100,7 @@ int wr_app_conf_req_set(config_application_list_t *app, node_t *app_node){
         wr_string_append(val, str, strlen(str));
       }
     }
-    nodes = NODE_NEXT(nodes);
+    node = node->next;
   }
   if(!wr_string_is_empty(val)){
    scgi_header_add(app->scgi, "ENV_VAR", strlen("ENV_VAR"), val.str, val.len); 
@@ -149,19 +149,19 @@ int wr_config_server_set(node_t *root) {
   }
 
   // Set logging level
-  str = wr_validate_string(get_node_value(root, "Server Specification/log_level"));
+  str = yaml_validate_string(yaml_get_value(root, "Server Specification/log_level"));
   if(str)
     Config->Server.log_level = get_log_severity(str); 
     
   // Set access log flag
-  str = wr_validate_string(get_node_value(root, "Server Specification/access_log"));
+  str = yaml_validate_string(yaml_get_value(root, "Server Specification/access_log"));
 
   if(str && strcmp(str,"enabled")==0 ) {
     Config->Server.flag |= SERVER_ACCESS_LOG;
   }
 
   //check ssl support
-  str = wr_validate_string(get_node_value(root, "Server Specification/SSL Specification/ssl_support"));
+  str = yaml_validate_string(yaml_get_value(root, "Server Specification/SSL Specification/ssl_support"));
   if(str && strcmp(str,"enabled")==0 ) {
     Config->Server.flag |= SERVER_SSL_SUPPORT;
   }
@@ -172,7 +172,7 @@ int wr_config_server_set(node_t *root) {
   	size_t len;
     struct stat buff;
     // Set certificate path
-    str = wr_validate_string(get_node_value(root, "Server Specification/SSL Specification/certificate_file"));
+    str = yaml_validate_string(yaml_get_value(root, "Server Specification/SSL Specification/certificate_file"));
     if(str) {
       if(stat(str,&buff)!=0) {
         LOG_ERROR(SEVERE,"SSL certificate file path(%s) invalid. Server can not run on SSL.",str);
@@ -189,7 +189,7 @@ int wr_config_server_set(node_t *root) {
     }
 
     // Set certificate path
-    str = wr_validate_string(get_node_value(root, "Server Specification/SSL Specification/key_file"));
+    str = yaml_validate_string(yaml_get_value(root, "Server Specification/SSL Specification/key_file"));
     if(str) {
       if(stat(str,&buff)!=0) {
         LOG_ERROR(SEVERE,"SSL key file path(%s) invalid. Server can not run on SSL.",str);
@@ -384,7 +384,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
   
   //Set application name
-  str = wr_validate_string(get_node_value(app_node->child, "name"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "name"));
   len = strlen(str);  
   if(str && len > 0 && len < WR_CONF_MAX_LEN_APP_NAME) {    
     wr_string_new(app->name, str, len);
@@ -407,7 +407,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set application path
-  str = wr_validate_string(get_node_value(app_node->child, "path"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "path"));
   if(str && strlen(str) > 0) {
     //Check existence of application path
     if(stat(str,&buff)!=0) {
@@ -431,7 +431,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set application type
-  str = wr_validate_string(get_node_value(app_node->child, "type"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "type"));
   if(str && strlen(str) > 0) {
     LOG_DEBUG(DEBUG, "Application Type = %s", str);
   } else {
@@ -444,7 +444,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set application analytics
-  str = wr_validate_string(get_node_value(app_node->child, "analytics"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "analytics"));
   if(str && strlen(str) > 0) {
     len = strlen(str);
     LOG_DEBUG(DEBUG,"App analytics = %s", str);
@@ -458,7 +458,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set application base uri
-  str = wr_validate_string(get_node_value(app_node->child, "baseuri"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "baseuri"));
   if(str && strlen(str) > 0) {
     len = strlen(str);
     wr_string_new(app->baseuri, str, len);
@@ -466,13 +466,13 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set Host names (used for multiple host deployment and application identifiaction)
-  str = wr_validate_string(get_node_value(app_node->child, "host_names"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "host_names"));
   if(str && strlen(str) > 0) {
     wr_app_host_name_set(app, str, err_msg);
   }
 
   // Set application user & group id
-  str = wr_validate_string(get_node_value(app_node->child, "run_as_user"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "run_as_user"));
   if(str && strlen(str) > 0) {
     len = strlen(str);
     struct passwd *user_info=NULL;
@@ -512,7 +512,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set application environment
-  str = wr_validate_string(get_node_value(app_node->child, "environment"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "environment"));
   if(str && strlen(str) > 0) {
     LOG_DEBUG(DEBUG, "Application environment = %s", str);
   }
@@ -553,7 +553,7 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
   }
 
   // Set logging level
-  str = wr_validate_string(get_node_value(app_node->child, "log_level"));
+  str = yaml_validate_string(yaml_get_value(app_node->child, "log_level"));
   if(str && strlen(str) > 0){
     app->log_level = get_log_severity(str);
   }
@@ -570,17 +570,17 @@ config_application_list_t* wr_config_application_set(node_t* app_node, char* err
 int wr_iterate_app_node(node_t *root) {
   LOG_FUNCTION
   config_application_list_t *app, *prev_app;
-  node_t* app_nodes;
+  node_t* app_node;
 
   LOG_DEBUG(DEBUG,"iterate_application_node()");
   //Fetch Application Specification nodes
-  app_nodes = get_nodes(root, "Application Specification");
+  app_node = yaml_get_node(root, "Application Specification/*");
 
   // Iterate application nodes
-  while(app_nodes) {
-    if(app_nodes->child) {
+  while(app_node) {
+    if(app_node->child) {
       // Create & fill application configuration structure
-      app = wr_config_application_set(app_nodes, NULL);
+      app = wr_config_application_set(app_node, NULL);
 
       if(app) {
         //return -1;
@@ -593,7 +593,7 @@ int wr_iterate_app_node(node_t *root) {
         prev_app = app;
       }
     }
-    app_nodes = NODE_NEXT(app_nodes);
+    app_node = app_node->next;
   }
   return 0;
 }
@@ -811,26 +811,26 @@ config_application_list_t* wr_conf_static_server_read() {
       if(!root) {
         LOG_ERROR(SEVERE, "Config file found with erroneous entries. Please correct it.");
       }else{
-        value = get_node_value(root,"Encoding/Content-Type");
+        value = yaml_get_value(root,"Encoding/Content-Type");
         if(value){
           scgi_header_add(app->scgi, "CONTENT_TYPE", strlen("CONTENT_TYPE"), value, strlen(value));
         }
 
-        value = get_node_value(root,"Encoding/User-Agent");
+        value = yaml_get_value(root,"Encoding/User-Agent");
         if(value){
           scgi_header_add(app->scgi, "USER_AGENT", strlen("USER_AGENT"), value, strlen(value));
         }
 
-        value = get_node_value(root,"Encoding/Size Limit/lower_limit");
+        value = yaml_get_value(root,"Encoding/Size Limit/lower_limit");
         if(value){
           scgi_header_add(app->scgi, "LOWER_LIMIT", strlen("LOWER_LIMIT"), value, strlen(value));
         }
 
-        value = get_node_value(root,"Encoding/Size Limit/upper_limit");
+        value = yaml_get_value(root,"Encoding/Size Limit/upper_limit");
         if(value){
           scgi_header_add(app->scgi, "UPPER_LIMIT", strlen("UPPER_LIMIT"), value, strlen(value));
         }
-        node_free(root);
+        yaml_node_free(root);
       }
 
       //Set max_worker & min_processsor
@@ -908,7 +908,7 @@ void wr_internal_conf_read(){
   wr_application_conf_read(root);
   wr_worker_conf_read(root);
   
-  node_free(root);
+  yaml_node_free(root);
 }
 
 /***********************************************************
@@ -973,7 +973,7 @@ int wr_conf_app_update(config_application_list_t *app) {
 config_application_list_t* wr_conf_app_read(const char *app_name, char* err_msg, int flag) {
   LOG_FUNCTION
   //Parse configuration file
-  node_t *root , *app_nodes = NULL;
+  node_t *root , *app_node = NULL;
   config_application_list_t *app = NULL, *old_app = NULL, *tmp;
   char *str;
   
@@ -1031,25 +1031,25 @@ config_application_list_t* wr_conf_app_read(const char *app_name, char* err_msg,
   }
 
   //  if(validate_application_baseuri_for_uniqueness(root, err_msg)!=0){
-  //    node_free(root);
+  //    yaml_node_free(root);
   //    return NULL;
   //  }
   //Fetch Application Specification nodes
-  app_nodes = get_nodes(root, "Application Specification");
+  app_node = yaml_get_node(root, "Application Specification/*");
 
   // Iterate application nodes
-  while(app_nodes) {
-    if(app_nodes->child) {
-      str = wr_validate_string(get_node_value(app_nodes->child, "name"));// Compare application name
+  while(app_node) {
+    if(app_node->child) {
+      str = yaml_validate_string(yaml_get_value(app_node->child, "name"));// Compare application name
       if(str && strcmp(str, app_name)==0) {
-        app = wr_config_application_set(app_nodes, err_msg);
+        app = wr_config_application_set(app_node, err_msg);
         break;
       }
     }
-    app_nodes = NODE_NEXT(app_nodes);
+    app_node = app_node->next;
   }
 
-  node_free(root);
+  yaml_node_free(root);
   if(app == NULL)   return NULL;
   
 
@@ -1116,7 +1116,7 @@ int wr_conf_read() {
   wr_remove_app_with_dup_host();
 
   //configuration_print(configuration);
-  node_free(root);
+  yaml_node_free(root);
   
   return TRUE;
 }

data/src/head/wr_controller.c

@@ -307,7 +307,7 @@ void wr_ctl_msg_read_cb(struct ev_loop *loop, struct ev_io *w, int revents) {
 
   scgi_t* request = NULL;
   request = scgi_parse(ctl->msg, ctl->ctl_nbytes);
-  if(request == NULL ) {
+  if(request == NULL || request->body_length != atoi(scgi_header_value_get(request, "CONTENT_LENGTH"))) {
     LOG_ERROR(SEVERE,"Cannot parse control message.");
     return;
   }

data/src/helper/wr_config.c

@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 
 #define SERVER_NAME       "WebROaR"
-#define SERVER_VERSION    "0.4.0"
+#define SERVER_VERSION    "0.5.0"
  
 #define FILE_PATH         "FILE_PATH"
 #define CONN_ID           "CONNECTION_ID"
@@ -303,7 +303,7 @@ void wr_worker_config_free(config_t *Config){
 }
 
 void wr_set_numeric_value(node_t *root, const char *path, void *value, wr_u_short flag){
-  char *str = wr_validate_string(get_node_value(root, path));
+  char *str = yaml_validate_string(yaml_get_value(root, path));
   long *lvalue = (long*) value;
   if(str) {
     wr_u_long val = atoi(str);

data/src/helper/wr_queue.h

@@ -38,7 +38,7 @@ void wr_queue_free(wr_queue_t* queue);
 #define WR_QUEUE_MAX_SIZE(queue) queue->q_max_size
 
 /** Insert element in Queue */
-#define WR_QUEUE_INSERT(queue, element, retval) \
+#define WR_QUEUE_INSERT(queue, element, retval) do {\
   retval = -1;\
   if(queue->q_count < queue->q_max_size){\
     queue->q_count++;\
@@ -46,10 +46,10 @@ void wr_queue_free(wr_queue_t* queue);
     if(queue->q_front == -1) queue->q_front = 0;\
     queue->q_elements[queue->q_rear] = element;\
     retval = 0;\
-  }
+  } } while(0);
 
 /** Fetch message from Message Queue */
-#define WR_QUEUE_FETCH(queue, element) \
+#define WR_QUEUE_FETCH(queue, element) do {\
   element = NULL;\
   if(queue->q_count > 0){\
     element = queue->q_elements[queue->q_front];\
@@ -59,6 +59,6 @@ void wr_queue_free(wr_queue_t* queue);
       queue->q_front = (queue->q_front + 1) % queue->q_max_size;\
     }\
     queue->q_count --;\
-  }
+  } } while(0);
 
 #endif /*WR_QUEUE_H_*/

data/src/helper/wr_stack.c

@@ -0,0 +1,65 @@
+/* WebROaR - Ruby Application Server - http://webroar.in/
+ * Copyright (C) 2009  Goonj LLC
+ *
+ * This file is part of WebROaR.
+ *
+ * WebROaR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * WebROaR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/******************************************************************************
+ *             Implementation of Stack
+ *****************************************************************************/
+
+#include <wr_stack.h>
+#include <malloc.h>
+
+struct wr_stack_node_s{
+  void *data;
+  wr_stack_node_t *next;
+};
+
+int wr_stack_push(wr_stack_t *stack, void *data){
+  wr_stack_node_t *new;
+  new = (wr_stack_node_t*) malloc(sizeof(wr_stack_node_t));
+
+  if(!new){
+    return -1;
+  }
+
+  new->data = data;
+  new->next = stack->list;
+  stack->list = new;
+
+  return 0;
+}
+
+void* wr_stack_pop(wr_stack_t *stack){
+
+  if(stack && stack->list){
+    wr_stack_node_t *tmp = stack->list;
+    void* data = tmp->data;
+    stack->list = stack->list->next;
+    free(tmp);
+    return data;
+  }
+
+  return NULL;
+}
+
+void wr_stack_init(wr_stack_t *stack){
+  stack->list = NULL;
+}
+
+void wr_stack_free(wr_stack_t *stack){
+  while(wr_stack_pop(stack));
+}

data/src/helper/wr_stack.h

@@ -0,0 +1,49 @@
+/* WebROaR - Ruby Application Server - http://webroar.in/
+ * Copyright (C) 2009  Goonj LLC
+ *
+ * This file is part of WebROaR.
+ *
+ * WebROaR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * WebROaR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/******************************************************************************
+ *                           Stack
+ *****************************************************************************/
+
+#ifndef WR_STACK_H_
+#define WR_STACK_H_
+
+typedef struct wr_stack_s wr_stack_t;
+typedef struct wr_stack_node_s wr_stack_node_t;
+
+/** Private structure to store stack elements */
+struct wr_stack_s{
+  wr_stack_node_t *list;
+};
+
+/** Push element to the Stack */
+int wr_stack_push(wr_stack_t *stack, void *data);
+
+/** Pop element from the Stack */
+void* wr_stack_pop(wr_stack_t *stack);
+
+/** Initialise the  Stack pointers */
+/* NOTE: stack pointer should not be NULL */
+void wr_stack_init(wr_stack_t *stack);
+
+/** Free list nodes from the Stack */
+/* NOTE: It only free the node list and not stack pointer */
+void wr_stack_free(wr_stack_t *stack);
+
+#endif /* WR_STACK_H_ */

data/src/helper/wr_string.h

@@ -33,13 +33,13 @@ typedef struct {
   char    *str;
 }wr_str_t;
 
-#define wr_string_is_empty(_str) _str.str == NULL
-#define wr_string_new(_str,str1,_len) _str.len = _len; _str.str = (char*) malloc(sizeof(char)*(_len+1)); memcpy(_str.str, str1, _len); _str.str[_len] = 0
-#define wr_string_null(_str) _str.len = 0; _str.str = NULL
-#define wr_string_append(_str, str1, _len)  {char *str2 =(char*) realloc(_str.str,sizeof(char)*(_str.len+_len+1));\
-        if(str2){memcpy(str2+_str.len, str1, _len); _str.len+=_len;str2[_str.len]=0;_str.str=str2;}}
-#define wr_string_free(_str) if(_str.str) free(_str.str); _str.len = 0; _str.str = NULL
-#define wr_string_dump(_str,_str1) _str.len = _str1.len;_str.str = (char*) malloc(sizeof(char)*(_str.len+1)); memcpy(_str.str, _str1.str, _str.len); _str.str[_str.len] = 0
+#define wr_string_is_empty(_str) _str.str == NULL 
+#define wr_string_new(_str,str1,_len) do { _str.len = _len; _str.str = (char*) malloc(sizeof(char)*(_len+1)); memcpy(_str.str, str1, _len); _str.str[_len] = 0; } while (0)
+#define wr_string_null(_str) do { _str.len = 0; _str.str = NULL; } while (0)
+#define wr_string_append(_str, str1, _len)  do { {char *str2 =(char*) realloc(_str.str,sizeof(char)*(_str.len+_len+1));\
+        if(str2){memcpy(str2+_str.len, str1, _len); _str.len+=_len;str2[_str.len]=0;_str.str=str2;}} } while (0)
+#define wr_string_free(_str) do { if(_str.str) free(_str.str); _str.len = 0; _str.str = NULL; } while (0)
+#define wr_string_dump(_str,_str1) do { _str.len = _str1.len;_str.str = (char*) malloc(sizeof(char)*(_str.len+1)); memcpy(_str.str, _str1.str, _str.len); _str.str[_str.len] = 0; } while (0)
 
 typedef struct {
   wr_str_t  key;
@@ -75,12 +75,12 @@ struct wr_buffer_s{
   wr_buffer_t  *next;
 };
 
-#define wr_buffer_new(_buf) _buf = wr_malloc(wr_buffer_t); _buf->len = _buf->size = 0; _buf->str = NULL
-#define wr_buffer_create(_buf,_size) _buf->len = 0; _buf->size = _size; _buf->str = (char*) malloc(sizeof(char)*(_size+1))
-#define wr_buffer_null(_buf) _buf->len = 0; if(_buf->str) free(_buf->str); _buf->str = NULL; _buf->size = 0
-#define wr_buffer_add(_buf, _str, _len) memcpy(_buf->str + _buf->len, _str, wr_min(_len, _buf->size - _buf->len)); _buf->len += wr_min(_len, _buf->size-_buf->len)
-#define wr_buffer_free(_buf) wr_buffer_null(_buf); free(_buf); _buf = NULL
-#define wr_buffer_set_zero(_buf) memset(_buf->str, 0, _buf->size)
+#define wr_buffer_new(_buf) do { _buf = wr_malloc(wr_buffer_t); _buf->len = _buf->size = 0; _buf->str = NULL; } while (0)
+#define wr_buffer_create(_buf,_size) do { _buf->len = 0; _buf->size = _size; _buf->str = (char*) malloc(sizeof(char)*(_size+1)); } while (0)
+#define wr_buffer_null(_buf) do { _buf->len = 0; if(_buf->str) free(_buf->str); _buf->str = NULL; _buf->size = 0; } while (0)
+#define wr_buffer_add(_buf, _str, _len) do { memcpy(_buf->str + _buf->len, _str, wr_min(_len, _buf->size - _buf->len)); _buf->len += wr_min(_len, _buf->size-_buf->len); } while (0)
+#define wr_buffer_free(_buf) do { wr_buffer_null(_buf); free(_buf); _buf = NULL; } while (0)
+#define wr_buffer_set_zero(_buf) do { memset(_buf->str, 0, _buf->size); } while (0)
 
 typedef struct {
   wr_buffer_t    *front;

data/src/helper/wr_util.h

@@ -49,11 +49,11 @@ void time_to_httpdate(time_t time, char *date, size_t len);
 /** Convert HTTP Date to C 'time_t' */
 time_t httpdate_to_c_time(const char *httpdate);
 
-#define URI_HASH_LEN(str, length, hash) \
+#define URI_HASH_LEN(str, length, hash) do {\
   hash = 5381;\
   int i;\
   for( i = 0; i < length && str[i] != 0 && str[i] != '/' ; i++){\
     hash = ((hash << 5) + hash) + str[i]; /* hash * 33 + c */\
-  }
+  } } while(0);
 
 #endif //WR_UTIL_H_