From: Anatol Belski <ab@php.net>
Date: Mon, 29 May 2017 08:02:51 +0000 (+0200)
Subject: move dba handlers to size_t
X-Git-Tag: php-7.2.0alpha1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29248d52b2a0b0ecb6340a0a8f0056e156a59f8c;p=php

move dba handlers to size_t
---

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index b04daefbb1..a925863111 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -1067,7 +1067,7 @@ PHP_FUNCTION(dba_exists)
 PHP_FUNCTION(dba_fetch)
 {
 	char *val;
-	int len = 0;
+	size_t len = 0;
 	DBA_ID_GET2_3;
 
 	if (ac==3) {
@@ -1140,7 +1140,7 @@ PHP_FUNCTION(dba_key_split)
 PHP_FUNCTION(dba_firstkey)
 {
 	char *fkey;
-	int len;
+	size_t len;
 	zval *id;
 	dba_info *info = NULL;
 
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(dba_firstkey)
 PHP_FUNCTION(dba_nextkey)
 {
 	char *nkey;
-	int len;
+	size_t len;
 	zval *id;
 	dba_info *info = NULL;
 
diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h
index a230ac19e4..61bf330409 100644
--- a/ext/dba/php_dba.h
+++ b/ext/dba/php_dba.h
@@ -79,12 +79,12 @@ typedef struct dba_handler {
 	int flags; /* whether and how dba does locking and other flags*/
 	int (*open)(dba_info *, char **error);
 	void (*close)(dba_info *);
-	char* (*fetch)(dba_info *, char *, int, int, int *);
-	int (*update)(dba_info *, char *, int, char *, int, int);
-	int (*exists)(dba_info *, char *, int);
-	int (*delete)(dba_info *, char *, int);
-	char* (*firstkey)(dba_info *, int *);
-	char* (*nextkey)(dba_info *, int *);
+	char* (*fetch)(dba_info *, char *, size_t, int, size_t *);
+	int (*update)(dba_info *, char *, size_t, char *, size_t, int);
+	int (*exists)(dba_info *, char *, size_t);
+	int (*delete)(dba_info *, char *, size_t);
+	char* (*firstkey)(dba_info *, size_t *);
+	char* (*nextkey)(dba_info *, size_t *);
 	int (*optimize)(dba_info *);
 	int (*sync)(dba_info *);
 	char* (*info)(struct dba_handler *hnd, dba_info *);
@@ -98,17 +98,17 @@ typedef struct dba_handler {
 #define DBA_CLOSE_FUNC(x) \
 	void dba_close_##x(dba_info *info)
 #define DBA_FETCH_FUNC(x) \
-	char *dba_fetch_##x(dba_info *info, char *key, int keylen, int skip, int *newlen)
+	char *dba_fetch_##x(dba_info *info, char *key, size_t keylen, int skip, size_t *newlen)
 #define DBA_UPDATE_FUNC(x) \
-	int dba_update_##x(dba_info *info, char *key, int keylen, char *val, int vallen, int mode)
+	int dba_update_##x(dba_info *info, char *key, size_t keylen, char *val, size_t vallen, int mode)
 #define DBA_EXISTS_FUNC(x) \
-	int dba_exists_##x(dba_info *info, char *key, int keylen)
+	int dba_exists_##x(dba_info *info, char *key, size_t keylen)
 #define DBA_DELETE_FUNC(x) \
-	int dba_delete_##x(dba_info *info, char *key, int keylen)
+	int dba_delete_##x(dba_info *info, char *key, size_t keylen)
 #define DBA_FIRSTKEY_FUNC(x) \
-	char *dba_firstkey_##x(dba_info *info, int *newlen)
+	char *dba_firstkey_##x(dba_info *info, size_t *newlen)
 #define DBA_NEXTKEY_FUNC(x) \
-	char *dba_nextkey_##x(dba_info *info, int *newlen)
+	char *dba_nextkey_##x(dba_info *info, size_t *newlen)
 #define DBA_OPTIMIZE_FUNC(x) \
 	int dba_optimize_##x(dba_info *info)
 #define DBA_SYNC_FUNC(x) \