Skip to content

Commit d4471c6

Browse files
committed
Remove int6store()
The implementation is broken (syntactically). As it's not used anyway, I'm just dropping it instead.
1 parent 5951ff7 commit d4471c6

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

ext/mysqli/mysqli_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ static int mysqli_options_get_option_zval_type(int option)
17151715
case MYSQL_OPT_LOCAL_INFILE:
17161716
case MYSQL_OPT_NAMED_PIPE:
17171717
#ifdef MYSQL_OPT_PROTOCOL
1718-
case MYSQL_OPT_PROTOCOL:
1718+
case MYSQL_OPT_PROTOCOL:
17191719
#endif /* MySQL 4.1.0 */
17201720
case MYSQL_OPT_READ_TIMEOUT:
17211721
case MYSQL_OPT_WRITE_TIMEOUT:

ext/mysqlnd/mysqlnd_portability.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
154154
*(((zend_uchar *)(T))+3)=(zend_uchar) (((A) >> 24)); \
155155
*(((zend_uchar *)(T))+4)=(zend_uchar) (((A) >> 32)); }
156156

157-
/* From Andrey Hristov, based on int5store() */
158-
#define int6store(T,A) { \
159-
*(((zend_uchar *)(T)))= (zend_uchar)((A));\
160-
*(((zend_uchar *)(T))+1))=(zend_uchar) (((A) >> 8));\
161-
*(((zend_uchar *)(T))+2))=(zend_uchar) (((A) >> 16));\
162-
*(((zend_uchar *)(T))+3))=(zend_uchar) (((A) >> 24)); \
163-
*(((zend_uchar *)(T))+4))=(zend_uchar) (((A) >> 32)); \
164-
*(((zend_uchar *)(T))+5))=(zend_uchar) (((A) >> 40)); }
165-
166157
#define int8store(T,A) *((uint64_t *) (T))= (uint64_t) (A)
167158

168159
typedef union {
@@ -236,14 +227,6 @@ typedef union {
236227
*(((char *)(T))+2) = (char)(((A) >> 16));\
237228
*(((char *)(T))+3) = (char)(((A) >> 24)); \
238229
*(((char *)(T))+4) = (char)(((A) >> 32)); } while (0)
239-
/* Based on int5store() from Andrey Hristov */
240-
#define int6store(T,A) do { \
241-
*(((char *)(T))) = (char)((A));\
242-
*(((char *)(T))+1) = (char)(((A) >> 8));\
243-
*(((char *)(T))+2) = (char)(((A) >> 16));\
244-
*(((char *)(T))+3) = (char)(((A) >> 24)); \
245-
*(((char *)(T))+4) = (char)(((A) >> 32)); \
246-
*(((char *)(T))+5) = (char)(((A) >> 40)); } while (0)
247230
#define int8store(T,A) { uint32_t def_temp= (uint32_t) (A), def_temp2= (uint32_t) ((A) >> 32); \
248231
int4store((T),def_temp); \
249232
int4store((T+4),def_temp2); \

0 commit comments

Comments
 (0)