]> granicus.if.org Git - php/commitdiff
compiler warnings fixed
authorAndrey Hristov <andrey@php.net>
Wed, 16 Mar 2011 11:51:56 +0000 (11:51 +0000)
committerAndrey Hristov <andrey@php.net>
Wed, 16 Mar 2011 11:51:56 +0000 (11:51 +0000)
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_structs.h

index 11413e2c7344c22aeb0635ac10b44f5ef8925ef7..52752f1cc0680fa907b5a3bd544c3fbd2a77b033 100644 (file)
@@ -85,14 +85,14 @@ int mysqlnd_local_infile_init(void **ptr, char *filename, void **userdata TSRMLS
 
 /* {{{ mysqlnd_local_infile_read */
 static
-int mysqlnd_local_infile_read(void *ptr, char *buf, unsigned int buf_len TSRMLS_DC)
+int mysqlnd_local_infile_read(void *ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC)
 {
        MYSQLND_INFILE_INFO     *info = (MYSQLND_INFILE_INFO *)ptr;
        int count;
 
        DBG_ENTER("mysqlnd_local_infile_read");
 
-       count = (int)php_stream_read(info->fd, buf, buf_len);
+       count = (int)php_stream_read(info->fd, (char *) buf, buf_len);
 
        if (count < 0) {
                strcpy(info->error_msg, "Error reading file");
@@ -173,8 +173,8 @@ static const char *lost_conn = "Lost connection to MySQL server during LOAD DATA
 enum_func_status
 mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC)
 {
-       char                            *buf = NULL;
-       char                            empty_packet[MYSQLND_HEADER_SIZE];
+       zend_uchar                      *buf = NULL;
+       zend_uchar                      empty_packet[MYSQLND_HEADER_SIZE];
        enum_func_status        result = FAIL;
        unsigned int            buflen = 4096;
        void                            *info = NULL;
@@ -194,7 +194,7 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
 
        infile = conn->infile;
        /* allocate buffer for reading data */
-       buf = (char *)mnd_ecalloc(1, buflen);
+       buf = (zend_uchar *)mnd_ecalloc(1, buflen);
 
        *is_warning = FALSE;
 
index 5f4580927a3a878a195ca13c6daa4b5084aea75f..38c9b3c02609ea23197017493aff560ea45cd73f 100644 (file)
@@ -398,7 +398,7 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const
                stmt_to_prepare = s_to_prepare->data;
        }
 
-       if (FAIL == stmt_to_prepare->conn->m->simple_command(stmt_to_prepare->conn, COM_STMT_PREPARE, query, query_len, PROT_LAST, FALSE, TRUE TSRMLS_CC) ||
+       if (FAIL == stmt_to_prepare->conn->m->simple_command(stmt_to_prepare->conn, COM_STMT_PREPARE, (const zend_uchar *) query, query_len, PROT_LAST, FALSE, TRUE TSRMLS_CC) ||
                FAIL == mysqlnd_stmt_read_prepare_response(s_to_prepare TSRMLS_CC))
        {
                goto fail;
@@ -694,7 +694,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const s TSRMLS_DC)
        ret = s->m->generate_execute_request(s, &request, &request_len, &free_request TSRMLS_CC);
        if (ret == PASS) {
                /* support for buffer types should be added here ! */
-               ret = stmt->conn->m->simple_command(stmt->conn, COM_STMT_EXECUTE, (char *)request, request_len,
+               ret = stmt->conn->m->simple_command(stmt->conn, COM_STMT_EXECUTE, request, request_len,
                                                                                        PROT_LAST /* we will handle the response packet*/,
                                                                                        FALSE, FALSE TSRMLS_CC);
        } else {
@@ -1036,7 +1036,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
        int4store(buf, stmt->stmt_id);
        int4store(buf + STMT_ID_LENGTH, 1); /* for now fetch only one row */
 
-       if (FAIL == stmt->conn->m->simple_command(stmt->conn, COM_STMT_FETCH, (char *)buf, sizeof(buf),
+       if (FAIL == stmt->conn->m->simple_command(stmt->conn, COM_STMT_FETCH, buf, sizeof(buf),
                                                                                          PROT_LAST /* we will handle the response packet*/,
                                                                                          FALSE, TRUE TSRMLS_CC)) {
                stmt->error_info = stmt->conn->error_info;
@@ -1259,7 +1259,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s TSRMLS_DC)
 
                int4store(cmd_buf, stmt->stmt_id);
                if (CONN_GET_STATE(conn) == CONN_READY &&
-                       FAIL == (ret = conn->m->simple_command(conn, COM_STMT_RESET, (char *)cmd_buf,
+                       FAIL == (ret = conn->m->simple_command(conn, COM_STMT_RESET, cmd_buf,
                                                                                                  sizeof(cmd_buf), PROT_OK_PACKET,
                                                                                                  FALSE, TRUE TSRMLS_CC))) {
                        stmt->error_info = conn->error_info;
@@ -1339,7 +1339,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
                        memcpy(cmd_buf + STMT_ID_LENGTH + 2, data, length);
 
                        /* COM_STMT_SEND_LONG_DATA doesn't send an OK packet*/
-                       ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len, PROT_LAST , FALSE, TRUE TSRMLS_CC);
+                       ret = conn->m->simple_command(conn, cmd, cmd_buf, packet_len, PROT_LAST , FALSE, TRUE TSRMLS_CC);
                        mnd_efree(cmd_buf);
                        if (FAIL == ret) {
                                stmt->error_info = conn->error_info;
@@ -2182,7 +2182,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_boo
 
                int4store(cmd_buf, stmt->stmt_id);
                if (CONN_GET_STATE(conn) == CONN_READY &&
-                       FAIL == conn->m->simple_command(conn, COM_STMT_CLOSE, (char *)cmd_buf, sizeof(cmd_buf),
+                       FAIL == conn->m->simple_command(conn, COM_STMT_CLOSE, cmd_buf, sizeof(cmd_buf),
                                                                                   PROT_LAST /* COM_STMT_CLOSE doesn't send an OK packet*/,
                                                                                   FALSE, TRUE TSRMLS_CC)) {
                        stmt->error_info = conn->error_info;
index a78a6bc8f0219e800d172d18d33a8c798a696dc4..5afd8eae04babcb37346bad8903c85bdad5875ff 100644 (file)
@@ -132,7 +132,7 @@ typedef struct st_mysqlnd_charset
 typedef struct st_mysqlnd_infile
 {
        int             (*local_infile_init)(void **ptr, char *filename, void **userdata TSRMLS_DC);
-       int             (*local_infile_read)(void *ptr, char *buf, unsigned int buf_len TSRMLS_DC);
+       int             (*local_infile_read)(void *ptr, zend_uchar * buf, unsigned int buf_len TSRMLS_DC);
        int             (*local_infile_error)(void *ptr, char *error_msg, unsigned int error_msg_len TSRMLS_DC);
        void    (*local_infile_end)(void *ptr TSRMLS_DC);
        zval    *callback;