Skip to content

Commit 29248d5

Browse files
committed
move dba handlers to size_t
1 parent c6c654c commit 29248d5

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

ext/dba/dba.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ PHP_FUNCTION(dba_exists)
10671067
PHP_FUNCTION(dba_fetch)
10681068
{
10691069
char *val;
1070-
int len = 0;
1070+
size_t len = 0;
10711071
DBA_ID_GET2_3;
10721072

10731073
if (ac==3) {
@@ -1140,7 +1140,7 @@ PHP_FUNCTION(dba_key_split)
11401140
PHP_FUNCTION(dba_firstkey)
11411141
{
11421142
char *fkey;
1143-
int len;
1143+
size_t len;
11441144
zval *id;
11451145
dba_info *info = NULL;
11461146

@@ -1167,7 +1167,7 @@ PHP_FUNCTION(dba_firstkey)
11671167
PHP_FUNCTION(dba_nextkey)
11681168
{
11691169
char *nkey;
1170-
int len;
1170+
size_t len;
11711171
zval *id;
11721172
dba_info *info = NULL;
11731173

ext/dba/php_dba.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ typedef struct dba_handler {
7979
int flags; /* whether and how dba does locking and other flags*/
8080
int (*open)(dba_info *, char **error);
8181
void (*close)(dba_info *);
82-
char* (*fetch)(dba_info *, char *, int, int, int *);
83-
int (*update)(dba_info *, char *, int, char *, int, int);
84-
int (*exists)(dba_info *, char *, int);
85-
int (*delete)(dba_info *, char *, int);
86-
char* (*firstkey)(dba_info *, int *);
87-
char* (*nextkey)(dba_info *, int *);
82+
char* (*fetch)(dba_info *, char *, size_t, int, size_t *);
83+
int (*update)(dba_info *, char *, size_t, char *, size_t, int);
84+
int (*exists)(dba_info *, char *, size_t);
85+
int (*delete)(dba_info *, char *, size_t);
86+
char* (*firstkey)(dba_info *, size_t *);
87+
char* (*nextkey)(dba_info *, size_t *);
8888
int (*optimize)(dba_info *);
8989
int (*sync)(dba_info *);
9090
char* (*info)(struct dba_handler *hnd, dba_info *);
@@ -98,17 +98,17 @@ typedef struct dba_handler {
9898
#define DBA_CLOSE_FUNC(x) \
9999
void dba_close_##x(dba_info *info)
100100
#define DBA_FETCH_FUNC(x) \
101-
char *dba_fetch_##x(dba_info *info, char *key, int keylen, int skip, int *newlen)
101+
char *dba_fetch_##x(dba_info *info, char *key, size_t keylen, int skip, size_t *newlen)
102102
#define DBA_UPDATE_FUNC(x) \
103-
int dba_update_##x(dba_info *info, char *key, int keylen, char *val, int vallen, int mode)
103+
int dba_update_##x(dba_info *info, char *key, size_t keylen, char *val, size_t vallen, int mode)
104104
#define DBA_EXISTS_FUNC(x) \
105-
int dba_exists_##x(dba_info *info, char *key, int keylen)
105+
int dba_exists_##x(dba_info *info, char *key, size_t keylen)
106106
#define DBA_DELETE_FUNC(x) \
107-
int dba_delete_##x(dba_info *info, char *key, int keylen)
107+
int dba_delete_##x(dba_info *info, char *key, size_t keylen)
108108
#define DBA_FIRSTKEY_FUNC(x) \
109-
char *dba_firstkey_##x(dba_info *info, int *newlen)
109+
char *dba_firstkey_##x(dba_info *info, size_t *newlen)
110110
#define DBA_NEXTKEY_FUNC(x) \
111-
char *dba_nextkey_##x(dba_info *info, int *newlen)
111+
char *dba_nextkey_##x(dba_info *info, size_t *newlen)
112112
#define DBA_OPTIMIZE_FUNC(x) \
113113
int dba_optimize_##x(dba_info *info)
114114
#define DBA_SYNC_FUNC(x) \

0 commit comments

Comments
 (0)