PHP mysqlnd svn commit: r962 - trunk/mysqlnd

Author: ahristov
Date: 2007-08-29 19:06:07 +0200 (Wed, 29 Aug 2007) New Revision: 962

Modified:

   trunk/mysqlnd/mysqlnd_debug.c
Log:
Fix several problems in one commit:

- SEMICOLON should be COLON
- Asking for either FILE or LINE, as giving both
- Fixed problem with "n" modified, the level_buffer was too small

Modified: trunk/mysqlnd/mysqlnd_debug.c

• trunk/mysqlnd/mysqlnd_debug.c 2007-08-29 16:46:10 UTC (rev 961) +++ trunk/mysqlnd/mysqlnd_debug.c 2007-08-29 17:06:07 UTC (rev 962)
  @@ -39,10 +39,10 @@
  #define MYSQLND_DEBUG_DUMP_TRACE 2 #define MYSQLND_DEBUG_DUMP_PID 4 #define MYSQLND_DEBUG_DUMP_LINE 8 -#define MYSQLND_DEBUG_DUMP_FILE 8 -#define MYSQLND_DEBUG_DUMP_LEVEL 16 -#define MYSQLND_DEBUG_APPEND 32 -#define MYSQLND_DEBUG_FLUSH 64 +#define MYSQLND_DEBUG_DUMP_FILE 16 +#define MYSQLND_DEBUG_DUMP_LEVEL 32 +#define MYSQLND_DEBUG_APPEND 64 +#define MYSQLND_DEBUG_FLUSH 128

 /* {{{ mysqlnd_debug::open */
 static enum_func_status
@@ -76,7 +76,7 @@

 	size_t message_line_len;
 	unsigned int flags = self->flags;
 	char pid_buffer[10], time_buffer[30], file_buffer[200],
-		 line_buffer[6], level_buffer[4];
+		 line_buffer[6], level_buffer[6];
 
 	if (!self->stream) {
 		if (FAIL == self->m->open(self, FALSE)) {

@@ -172,7 +172,7 @@

 	va_list args;
 	unsigned int flags = self->flags;
 	char pid_buffer[10], time_buffer[30], file_buffer[200],
-		 line_buffer[6], level_buffer[4];
+		 line_buffer[6], level_buffer[6];
 
 	if (!self->stream) {
 		if (FAIL == self->m->open(self, FALSE)) {

 	PARSER_WAIT_MODIFIER,
-	PARSER_WAIT_SEMICOLON,
+	PARSER_WAIT_COLON,
 	PARSER_WAIT_VALUE

@@ -358,10 +358,10 @@

 				} else {
 					self->file_name = (char *) mysqlnd_debug_default_trace_file;
 				}
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case ':':
-				if (state != PARSER_WAIT_SEMICOLON) {
+				if (state != PARSER_WAIT_COLON) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Consecutive semicolons at position %u", i);
 				}
 				state = PARSER_WAIT_MODIFIER;

@@ -381,23 +381,23 @@

 					}
 					state = PARSER_WAIT_VALUE;
 				}
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'F':
 				self->flags |= MYSQLND_DEBUG_DUMP_FILE;
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'i':
 				self->flags |= MYSQLND_DEBUG_DUMP_PID;
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'L':
 				self->flags |= MYSQLND_DEBUG_DUMP_LINE;
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'n':
 				self->flags |= MYSQLND_DEBUG_DUMP_LEVEL;
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
Do you need help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 				break;
 			case 't':
 				if (mode[i+1] == ',') {

@@ -417,21 +417,25 @@

 				} else {
 					self->flags |= MYSQLND_DEBUG_DUMP_TRACE;
 				}
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'T':
 				self->flags |= MYSQLND_DEBUG_DUMP_TIME;
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			case 'N':
 			case 'P':
 			case 'r':
 			case 'S':
-				state = PARSER_WAIT_SEMICOLON;
+				state = PARSER_WAIT_COLON;
 				break;
 			default:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized format '%c'", mode[i]);
-				state = PARSER_WAIT_SEMICOLON;
+				if (state == PARSER_WAIT_MODIFIER) {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized format '%c'", mode[i]);
+					state = PARSER_WAIT_COLON;
+				} else if (state == PARSER_WAIT_COLON) {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Colon expected, '%c' found", mode[i]);				
+				}
 				break;
 		}
 	}

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com