kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ndbm compile warnings (bug #2540)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-17 22:24:46 +00:00
parent 12e2fe4d94
commit e1dcf90094
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
db1-ast/hash/ndbm.c
View File

@@ -105,15 +105,20 @@ dbm_fetch(db, key)
DBM *db;
datum key;
{
datum retval;
datum retdata;
int status;
DBT dbtkey, dbtretdata;
status = (db->get)(db, (DBT *)&key, (DBT *)&retval, 0);
dbtkey.data = key.dptr;
dbtkey.size = key.dsize;
status = (db->get)(db, &dbtkey, &dbtretdata, 0);
if (status) {
retval.dptr = NULL;
retval.dsize = 0;
dbtretdata.data = NULL;
dbtretdata.size = 0;
}
return (retval);
retdata.dptr = dbtretdata.data;
retdata.dsize = dbtretdata.size;
return (retdata);
}
/*
@@ -126,11 +131,14 @@ dbm_firstkey(db)
DBM *db;
{
int status;
datum retdata, retkey;
datum retkey;
DBT dbtretkey, dbtretdata;
status = (db->seq)(db, (DBT *)&retkey, (DBT *)&retdata, R_FIRST);
status = (db->seq)(db, &dbtretkey, &dbtretdata, R_FIRST);
if (status)
retkey.dptr = NULL;
dbtretkey.data = NULL;
retkey.dptr = dbtretkey.data;
retkey.dsize = dbtretkey.size;
return (retkey);
}
@@ -144,11 +152,14 @@ dbm_nextkey(db)
DBM *db;
{
int status;
datum retdata, retkey;
datum retkey;
DBT dbtretkey, dbtretdata;
status = (db->seq)(db, (DBT *)&retkey, (DBT *)&retdata, R_NEXT);
status = (db->seq)(db, &dbtretkey, &dbtretdata, R_NEXT);
if (status)
retkey.dptr = NULL;
dbtretkey.data = NULL;
retkey.dptr = dbtretkey.data;
retkey.dsize = dbtretkey.size;
return (retkey);
}
/*
@@ -162,8 +173,11 @@ dbm_delete(db, key)
datum key;
{
int status;
DBT dbtkey;
status = (db->del)(db, (DBT *)&key, 0);
dbtkey.data = key.dptr;
dbtkey.size = key.dsize;
status = (db->del)(db, &dbtkey, 0);
if (status)
return (-1);
else
@@ -177,12 +191,18 @@ dbm_delete(db, key)
* 1 if DBM_INSERT and entry exists
*/
extern int
dbm_store(db, key, content, flags)
dbm_store(db, key, data, flags)
DBM *db;
datum key, content;
datum key, data;
int flags;
{
return ((db->put)(db, (DBT *)&key, (DBT *)&content,
DBT dbtkey, dbtdata;
dbtkey.data = key.dptr;
dbtkey.size = key.dsize;
dbtdata.data = data.dptr;
dbtdata.size = data.dsize;
return ((db->put)(db, &dbtkey, &dbtdata,
(flags == DBM_INSERT) ? R_NOOVERWRITE : 0));
}