Merge pull request #1 from jvoisin/pr1

pr for fetching upstream

1 files changed, 9 insertions, 6 deletions

diff --git a/src/sp_config_scanner.re b/src/sp_config_scanner.re
index d7c9884..6a14a11 100644
--- a/src/sp_config_scanner.re
+++ b/src/sp_config_scanner.re
@@ -1,5 +1,7 @@
 #include "php_snuffleupagus.h"
 
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+
 /*!types:re2c*/
 
 #define cs_log_error(fmt, ...) sp_log_err("config", fmt, ##__VA_ARGS__)
@@ -7,7 +9,7 @@
 #define cs_log_warning(fmt, ...) sp_log_warn("config", fmt, ##__VA_ARGS__)
 
 
-zend_string *sp_get_arg_string(sp_parsed_keyword *kw) {
+zend_string *sp_get_arg_string(sp_parsed_keyword const *const kw) {
   if (!kw || !kw->arg) {
     return NULL;
   }
@@ -33,11 +35,10 @@ zend_string *sp_get_arg_string(sp_parsed_keyword *kw) {
   return ret;
 }
 
-zend_string *sp_get_textual_representation(sp_parsed_keyword *parsed_rule) {
+zend_string *sp_get_textual_representation(sp_parsed_keyword const *const parsed_rule) {
   // a rule is "sp.keyword...keyword(arg);\0"
   size_t len = 3; // sp + ;
-  sp_parsed_keyword *kw;
-  for (kw = parsed_rule; kw->kw; kw++) {
+  for (const sp_parsed_keyword *kw = parsed_rule; kw->kw; kw++) {
     len++; // .
     len += kw->kwlen;
     if (kw->argtype == SP_ARGTYPE_EMPTY) {
@@ -47,10 +48,12 @@ zend_string *sp_get_textual_representation(sp_parsed_keyword *parsed_rule) {
         len += kw->arglen;
     }
   }
+
   zend_string *ret = zend_string_alloc(len, 1);
   char *ptr = ZSTR_VAL(ret);
+
   memcpy(ptr, "sp", 2); ptr += 2;
-  for (kw = parsed_rule; kw->kw; kw++) {
+  for (const sp_parsed_keyword *kw = parsed_rule; kw->kw; kw++) {
     *ptr++ = '.';
     memcpy(ptr, kw->kw, kw->kwlen); ptr += kw->kwlen;
     if (kw->argtype == SP_ARGTYPE_EMPTY || kw->argtype == SP_ARGTYPE_STR || kw->argtype == SP_ARGTYPE_UNKNOWN) {
@@ -322,4 +325,4 @@ zend_result sp_config_scan(char *data, zend_result (*process_rule)(sp_parsed_key
 out:
   zend_hash_destroy(&vars);
   return ret;
-}
\ No newline at end of file
+}