helly Fri Sep 5 15:27:27 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_profiler.c
mysqli_profiler.h
Log:
Fix warnings
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.14 php-src/ext/mysqli/mysqli_nonapi.c:1.15
--- php-src/ext/mysqli/mysqli_nonapi.c:1.14 Mon Jul 28 06:23:36 2003
+++ php-src/ext/mysqli/mysqli_nonapi.c Fri Sep 5 15:27:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.14 2003/07/28 10:23:36 sniper Exp $
+ $Id: mysqli_nonapi.c,v 1.15 2003/09/05 19:27:26 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -194,6 +194,8 @@
if (MyG(profiler)) {
gettimeofday(&starttime, NULL);
prresult = (PR_RESULT *)MYSQLI_PROFILER_NEW(prquery, MYSQLI_PR_RESULT,
1);
+ } else {
+ prresult = NULL;
}
result = (resultmode == MYSQLI_USE_RESULT) ? mysql_use_result(mysql) :
mysql_store_result(mysql);
Index: php-src/ext/mysqli/mysqli_profiler.c
diff -u php-src/ext/mysqli/mysqli_profiler.c:1.9
php-src/ext/mysqli/mysqli_profiler.c:1.10
--- php-src/ext/mysqli/mysqli_profiler.c:1.9 Thu Aug 28 16:51:18 2003
+++ php-src/ext/mysqli/mysqli_profiler.c Fri Sep 5 15:27:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_profiler.c,v 1.9 2003/08/28 20:51:18 andrey Exp $
+ $Id: mysqli_profiler.c,v 1.10 2003/09/05 19:27:26 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -49,7 +49,9 @@
break;
case MYSQLI_PR_RESULT:
prnew = (PR_COMMON *)ecalloc(1, sizeof(PR_RESULT));
- break;
+ break;
+ default:
+ return NULL;
}
prnew->header.type = type;
prnew->header.filename = estrdup(zend_get_executed_filename(TSRMLS_C));
Index: php-src/ext/mysqli/mysqli_profiler.h
diff -u php-src/ext/mysqli/mysqli_profiler.h:1.4
php-src/ext/mysqli/mysqli_profiler.h:1.5
--- php-src/ext/mysqli/mysqli_profiler.h:1.4 Mon Jun 16 20:49:24 2003
+++ php-src/ext/mysqli/mysqli_profiler.h Fri Sep 5 15:27:26 2003
@@ -145,6 +145,8 @@
if (MyG(profiler))\
{\
cmd = (PR_COMMAND *)php_mysqli_profiler_new_object((PR_COMMON *)parent,
MYSQLI_PR_COMMAND,1);\
+} else {\
+ cmd = NULL;\
}
#define MYSQLI_PROFILER_COMMAND_RETURNLONG(cmd, value)\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
