diff options
| author | Marcus Boerger <helly@php.net> | 2003-08-17 15:43:41 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-08-17 15:43:41 +0000 |
| commit | 0d5ee859dd5b7f2a0ca3102c84bf4de5a32c41e7 (patch) | |
| tree | deb7e93dca8db12d8e2d265ec85b982eb5fd09d0 /ext/sqlite | |
| parent | 2405caf32eb0f6d5874cb84657981e9f5c8f0e5f (diff) | |
| download | php-git-0d5ee859dd5b7f2a0ca3102c84bf4de5a32c41e7.tar.gz | |
Fix warnings
Diffstat (limited to 'ext/sqlite')
| -rw-r--r-- | ext/sqlite/sqlite.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index de1ec842f6..50d36f8469 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -66,6 +66,9 @@ extern ps_module ps_mod_sqlite; extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out); extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out); +#define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out) +#define php_sqlite_decode_binary(in, out) sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) + static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb; static inline void php_sqlite_strtoupper(char *s) @@ -1498,7 +1501,7 @@ static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend ZVAL_NULL(decoded); } else if (decode_binary && rowdata[j][0] == '\x01') { Z_STRVAL_P(decoded) = emalloc(strlen(rowdata[j])); - Z_STRLEN_P(decoded) = sqlite_decode_binary(rowdata[j]+1, Z_STRVAL_P(decoded)); + Z_STRLEN_P(decoded) = php_sqlite_decode_binary(rowdata[j]+1, Z_STRVAL_P(decoded)); Z_STRVAL_P(decoded)[Z_STRLEN_P(decoded)] = '\0'; Z_TYPE_P(decoded) = IS_STRING; if (!buffered) { @@ -1575,7 +1578,7 @@ static void php_sqlite_fetch_column(struct php_sqlite_result *res, zval *which, } else if (decode_binary && rowdata[j] != NULL && rowdata[j][0] == '\x01') { int l = strlen(rowdata[j]); char *decoded = emalloc(l); - l = sqlite_decode_binary(rowdata[j]+1, decoded); + l = php_sqlite_decode_binary(rowdata[j]+1, decoded); decoded[l] = '\0'; RETVAL_STRINGL(decoded, l, 0); if (!res->buffered) { @@ -1747,7 +1750,7 @@ static void php_sqlite_fetch_single(struct php_sqlite_result *res, zend_bool dec if (decode_binary && rowdata[0] != NULL && rowdata[0][0] == '\x01') { decoded = emalloc(strlen(rowdata[0])); - decoded_len = sqlite_decode_binary(rowdata[0]+1, decoded); + decoded_len = php_sqlite_decode_binary(rowdata[0]+1, decoded); if (!res->buffered) { efree((char*)rowdata[0]); rowdata[0] = NULL; @@ -2305,7 +2308,7 @@ PHP_FUNCTION(sqlite_escape_string) ret = emalloc( 1 + ((256 * stringlen + 1262) / 253) ); ret[0] = '\x01'; - enclen = sqlite_encode_binary((const unsigned char*)string, stringlen, ret+1); + enclen = php_sqlite_encode_binary(string, stringlen, ret+1); RETVAL_STRINGL(ret, enclen+1, 0); } else { @@ -2535,7 +2538,7 @@ PHP_FUNCTION(sqlite_udf_encode_binary) ret = emalloc( 1 + ((256 * datalen + 1262) / 253) ); ret[0] = '\x01'; - enclen = sqlite_encode_binary((const unsigned char*)data, datalen, ret+1); + enclen = php_sqlite_encode_binary(data, datalen, ret+1); RETVAL_STRINGL(ret, enclen+1, 0); } else { RETVAL_STRINGL(data, datalen, 1); @@ -2563,7 +2566,7 @@ PHP_FUNCTION(sqlite_udf_decode_binary) char *ret; ret = emalloc(datalen); - enclen = sqlite_decode_binary((const unsigned char*)data+1, ret); + enclen = php_sqlite_decode_binary(data+1, ret); ret[enclen] = '\0'; RETVAL_STRINGL(ret, enclen, 0); } else { |