From 3ba2b7e37cb24f951f557c4a4f62920154a7c0d2 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 21 Sep 2017 16:19:44 +0200
Subject: Improve a bit the .travis.yml file

---
 src/config.m4  | 13 ++++++++-----
 src/sp_utils.c |  7 ++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/config.m4 b/src/config.m4
index 84ca2f4..4f70871 100644
--- a/src/config.m4
+++ b/src/config.m4
@@ -19,8 +19,9 @@ PHP_ARG_ENABLE(debug, whether to enable debug messages,
 CFLAGS="$CFLAGS -lpcre"
 CFLAGS="$CFLAGS -D_DEFAULT_SOURCE=1 -std=c99"
 CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
+CFLAGS="$CFLAGS --coverage"
 
-LFLAGS="$LFLAGS -lpcre"
+LDFLAGS="$LDFLAGS -lpcre --coverage"
 
 if test "$PHP_DEBUG" = "yes"; then
 	AC_DEFINE(SP_DEBUG, 1, [Wether you want to enable debug messages])
@@ -28,12 +29,14 @@ fi
 
 AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE(HAVE_PCRE, 1, [have pcre]))
 
-if test "$PHP_SNUFFLEUPAGUS" != "no"; then
-   if test "$PHP_COVERAGE" != "no"; then
-      CFLAGS="$CFLAGS --coverage -fprofile-arcs -ftest-coverage"
+if test "$PHP_SNUFFLEUPAGUS" = "yes"; then
+   if test "$PHP_COVERAGE" = "yes"; then
+      CFLAGS="$CFLAGS --coverage"
       LDFLAGS="$LDFLAGS --coverage"
-      PHP_NEW_EXTENSION(snuffleupagus, $sources, $ext_shared,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -g -fprofile-arcs -ftest-coverage -lgcov)
+      PHP_NEW_EXTENSION(snuffleupagus, $sources, $ext_shared,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -g --coverage -lgcov)
    else
+      CFLAGS="$CFLAGS --coverage"
+      LDFLAGS="$LDFLAGS --coverage"
       PHP_NEW_EXTENSION(snuffleupagus, $sources, $ext_shared,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
    fi
 fi
diff --git a/src/sp_utils.c b/src/sp_utils.c
index 56512df..2370a6d 100644
--- a/src/sp_utils.c
+++ b/src/sp_utils.c
@@ -39,7 +39,7 @@ int compute_hash(const char* const filename, char* file_hash) {
       php_stream_open_wrapper(filename, "rb", REPORT_ERRORS, NULL);
   if (!stream) {
     sp_log_err("hash_computation", "Can not open the file %s to compute its hash.\n", filename);
-    return -1;
+    return FAILURE;
   }
 
   PHP_SHA256Init(&context);
@@ -49,7 +49,7 @@ int compute_hash(const char* const filename, char* file_hash) {
   PHP_SHA256Final(digest, &context);
   php_stream_close(stream);
   make_digest_ex(file_hash, digest, SHA256_SIZE);
-  return 0;
+  return SUCCESS;
 }
 
 static void construct_filename(char* filename, const char* folder) {
@@ -123,7 +123,7 @@ int sp_log_request(const char* folder) {
 
     // Allocate and copy the data
     // FIXME Why are we even allocating?
-    param = pecalloc(params_len, 1, 0);
+    param = ecalloc(params_len, 1);
     NCAT_AND_DEC(param, zones[i].str, params_len);
     NCAT_AND_DEC(param, ":", params_len);
     ZEND_HASH_FOREACH_STR_KEY_VAL(ht, variable_key, variable_value) {
@@ -138,6 +138,7 @@ int sp_log_request(const char* folder) {
 
     fputs(param, file);
     fputs("\n", file);
+    efree(param);
   }
   fclose(file);
 
-- 
cgit v1.3