Memory management improved when config parsing.

Author: Stas Kobzar

Makefile

@@ -211,7 +211,7 @@ AUTOMAKE = ${SHELL} /home/stas/Dev/amiws/missing automake-1.15
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
+CFLAGS = -coverage -O0
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo

config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by amiws configure 2.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --with-ssl
+  $ ./configure --with-ssl CFLAGS=-coverage -O0
 
 ## --------- ##
 ## Platform. ##
@@ -99,35 +99,35 @@ gcc: fatal error: no input files
 compilation terminated.
 configure:3129: $? = 1
 configure:3149: checking whether the C compiler works
-configure:3171: gcc    conftest.c  >&5
+configure:3171: gcc -coverage -O0   conftest.c  >&5
 configure:3175: $? = 0
 configure:3223: result: yes
 configure:3226: checking for C compiler default output file name
 configure:3228: result: a.out
 configure:3234: checking for suffix of executables
-configure:3241: gcc -o conftest    conftest.c  >&5
+configure:3241: gcc -o conftest -coverage -O0   conftest.c  >&5
 configure:3245: $? = 0
 configure:3267: result: 
 configure:3289: checking whether we are cross compiling
-configure:3297: gcc -o conftest    conftest.c  >&5
+configure:3297: gcc -o conftest -coverage -O0   conftest.c  >&5
 configure:3301: $? = 0
 configure:3308: ./conftest
 configure:3312: $? = 0
 configure:3327: result: no
 configure:3332: checking for suffix of object files
-configure:3354: gcc -c   conftest.c >&5
+configure:3354: gcc -c -coverage -O0  conftest.c >&5
 configure:3358: $? = 0
 configure:3379: result: o
 configure:3383: checking whether we are using the GNU C compiler
-configure:3402: gcc -c   conftest.c >&5
+configure:3402: gcc -c -coverage -O0  conftest.c >&5
 configure:3402: $? = 0
 configure:3411: result: yes
 configure:3420: checking whether gcc accepts -g
 configure:3440: gcc -c -g  conftest.c >&5
 configure:3440: $? = 0
 configure:3481: result: yes
 configure:3498: checking for gcc option to accept ISO C89
-configure:3561: gcc  -c -g -O2  conftest.c >&5
+configure:3561: gcc  -c -coverage -O0  conftest.c >&5
 configure:3561: $? = 0
 configure:3574: result: none needed
 configure:3599: checking whether gcc understands -c and -o together
@@ -141,19 +141,19 @@ configure:3692: result: GNU
 configure:3718: checking dependency style of gcc
 configure:3829: result: gcc3
 configure:3848: checking for gcc option to accept ISO C99
-configure:3997: gcc  -c -g -O2  conftest.c >&5
+configure:3997: gcc  -c -coverage -O0  conftest.c >&5
 configure:3997: $? = 0
 configure:4010: result: none needed
 configure:4118: checking for gcc option to accept ISO Standard C
 configure:4129: result: none needed
 configure:4146: checking for yaml_parser_initialize in -lyaml
-configure:4171: gcc -o conftest -g -O2   conftest.c -lyaml   >&5
+configure:4171: gcc -o conftest -coverage -O0   conftest.c -lyaml   >&5
 configure:4171: $? = 0
 configure:4180: result: yes
 configure:4197: checking for library containing CRYPTO_new_ex_data
-configure:4228: gcc -o conftest -g -O2   conftest.c -lyaml  >&5
-/tmp/stas/cceQIZMu.o: In function `main':
-/home/stas/Dev/amiws/conftest.c:23: undefined reference to `CRYPTO_new_ex_data'
+configure:4228: gcc -o conftest -coverage -O0   conftest.c -lyaml  >&5
+/tmp/stas/ccGMXY0q.o: In function `main':
+conftest.c:(.text+0x1c): undefined reference to `CRYPTO_new_ex_data'
 collect2: error: ld returned 1 exit status
 configure:4228: $? = 1
 configure: failed program was:
@@ -183,7 +183,7 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4228: gcc -o conftest -g -O2   conftest.c -leay32  -lyaml  >&5
+configure:4228: gcc -o conftest -coverage -O0   conftest.c -leay32  -lyaml  >&5
 /usr/bin/ld: cannot find -leay32
 collect2: error: ld returned 1 exit status
 configure:4228: $? = 1
@@ -214,13 +214,13 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4228: gcc -o conftest -g -O2   conftest.c -lcrypto  -lyaml  >&5
+configure:4228: gcc -o conftest -coverage -O0   conftest.c -lcrypto  -lyaml  >&5
 configure:4228: $? = 0
 configure:4245: result: -lcrypto
 configure:4257: checking for library containing SSL_library_init
-configure:4288: gcc -o conftest -g -O2   conftest.c -lcrypto -lyaml  >&5
-/tmp/stas/cccJrYjT.o: In function `main':
-/home/stas/Dev/amiws/conftest.c:23: undefined reference to `SSL_library_init'
+configure:4288: gcc -o conftest -coverage -O0   conftest.c -lcrypto -lyaml  >&5
+/tmp/stas/ccAClFMJ.o: In function `main':
+conftest.c:(.text+0x1c): undefined reference to `SSL_library_init'
 collect2: error: ld returned 1 exit status
 configure:4288: $? = 1
 configure: failed program was:
@@ -250,7 +250,7 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4288: gcc -o conftest -g -O2   conftest.c -lssleay32  -lcrypto -lyaml  >&5
+configure:4288: gcc -o conftest -coverage -O0   conftest.c -lssleay32  -lcrypto -lyaml  >&5
 /usr/bin/ld: cannot find -lssleay32
 collect2: error: ld returned 1 exit status
 configure:4288: $? = 1
@@ -281,7 +281,7 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4288: gcc -o conftest -g -O2   conftest.c -lssl  -lcrypto -lyaml  >&5
+configure:4288: gcc -o conftest -coverage -O0   conftest.c -lssl  -lcrypto -lyaml  >&5
 configure:4288: $? = 0
 configure:4305: result: -lssl
 configure:4330: checking how to run the C preprocessor
@@ -329,51 +329,51 @@ configure:4521: result: /bin/grep
 configure:4526: checking for egrep
 configure:4588: result: /bin/grep -E
 configure:4593: checking for ANSI C header files
-configure:4613: gcc -c -g -O2  conftest.c >&5
+configure:4613: gcc -c -coverage -O0  conftest.c >&5
 configure:4613: $? = 0
-configure:4686: gcc -o conftest -g -O2   conftest.c -lssl -lcrypto -lyaml  >&5
+configure:4686: gcc -o conftest -coverage -O0   conftest.c -lssl -lcrypto -lyaml  >&5
 configure:4686: $? = 0
 configure:4686: ./conftest
 configure:4686: $? = 0
 configure:4697: result: yes
 configure:4710: checking for sys/types.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for sys/stat.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for stdlib.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for string.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for memory.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for strings.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for inttypes.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for stdint.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4710: checking for unistd.h
-configure:4710: gcc -c -g -O2  conftest.c >&5
+configure:4710: gcc -c -coverage -O0  conftest.c >&5
 configure:4710: $? = 0
 configure:4710: result: yes
 configure:4722: checking syslog.h usability
-configure:4722: gcc -c -g -O2  conftest.c >&5
+configure:4722: gcc -c -coverage -O0  conftest.c >&5
 configure:4722: $? = 0
 configure:4722: result: yes
 configure:4722: checking syslog.h presence
@@ -386,7 +386,7 @@ configure:4783: checking for ar
 configure:4799: found /usr/bin/ar
 configure:4810: result: ar
 configure:4836: checking the archiver (ar) interface
-configure:4852: gcc -c -g -O2  conftest.c >&5
+configure:4852: gcc -c -coverage -O0  conftest.c >&5
 configure:4852: $? = 0
 configure:4854: ar cru libconftest.a conftest.o >&5
 ar: `u' modifier ignored since `D' is the default (see `U')
@@ -430,8 +430,8 @@ config.status:1092: executing depfiles commands
 ac_cv_c_compiler_gnu=yes
 ac_cv_env_CC_set=
 ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-coverage -O0'
 ac_cv_env_CPPFLAGS_set=
 ac_cv_env_CPPFLAGS_value=
 ac_cv_env_CPP_set=
@@ -501,7 +501,7 @@ AUTOMAKE='${SHELL} /home/stas/Dev/amiws/missing automake-1.15'
 AWK='gawk'
 CC='gcc'
 CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2'
+CFLAGS='-coverage -O0'
 CPP='gcc -E'
 CPPFLAGS=''
 CYGPATH_W='echo'

config.status

@@ -427,7 +427,7 @@ $config_commands
 
 Report bugs to <[email protected]>."
 
-ac_cs_config="'--with-ssl'"
+ac_cs_config="'--with-ssl' 'CFLAGS=-coverage -O0'"
 ac_cs_version="\
 amiws config.status 2.0.0
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -519,7 +519,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/bash './configure'  '--with-ssl' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/bash './configure'  '--with-ssl' 'CFLAGS=-coverage -O0' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'
@@ -644,7 +644,7 @@ S["EXEEXT"]=""
 S["ac_ct_CC"]="gcc"
 S["CPPFLAGS"]=""
 S["LDFLAGS"]=""
-S["CFLAGS"]="-g -O2"
+S["CFLAGS"]="-coverage -O0"
 S["CC"]="gcc"
 S["RANLIB"]="ranlib"
 S["AM_BACKSLASH"]="\\"

doc/Makefile

@@ -128,7 +128,7 @@ AUTOMAKE = ${SHELL} /home/stas/Dev/amiws/missing automake-1.15
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
+CFLAGS = -coverage -O0
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo

src/Makefile

@@ -217,7 +217,7 @@ AUTOMAKE = ${SHELL} /home/stas/Dev/amiws/missing automake-1.15
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
+CFLAGS = -coverage -O0
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo

src/lib/Makefile

@@ -198,7 +198,7 @@ AUTOMAKE = ${SHELL} /home/stas/Dev/amiws/missing automake-1.15
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
+CFLAGS = -coverage -O0
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo

src/lib/amiws.h

@@ -62,13 +62,15 @@
   conf->size          = 0;                    \
   conf->head          = NULL;                 \
   conf->tail          = NULL;                 \
-  conf->web_root      = DEFAULT_WEB_ROOT;     \
+  conf->web_root      = NULL;                 \
   conf->auth_domain   = NULL;                 \
+  conf->parse_fail    = 0;                    \
+  conf->syntax_error  = 0;                    \
   conf->auth_file     = NULL;
 
 
 /*! Macro to initilize AMI connection. */
-#define macro_init_conn(conn) conn = (struct amiws_conn *) calloc(1, sizeof(struct amiws_conn)); \
+#define macro_init_conn(conn) conn = (struct amiws_conn *) malloc(sizeof(struct amiws_conn)); \
   conn->port = 5038;      \
   conn->address = NULL;   \
   conn->name = NULL;      \
@@ -98,6 +100,9 @@ struct amiws_config {
   char *ssl_cert;           /*!< SSL certificate file. */
   char *ssl_key;            /*!< SSL key file. */
 #endif
+
+  int parse_fail:1;
+  int syntax_error:1;
 };
 
 /*!