gstein 01/04/30 22:31:22
Modified: dbm apr_dbm.c Log: Add a few parens to the macros to ensure proper argument precedence binding. Revision Changes Path 1.22 +3 -3 apr-util/dbm/apr_dbm.c Index: apr_dbm.c =================================================================== RCS file: /home/cvs/apr-util/dbm/apr_dbm.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -u -r1.21 -r1.22 --- apr_dbm.c 2001/04/30 18:57:49 1.21 +++ apr_dbm.c 2001/05/01 05:31:22 1.22 @@ -79,11 +79,11 @@ #define RETURN_DATUM(poutput, rd) (*(poutput) = *(apr_datum_t *)&(rd)) #define APR_DBM_CLOSE(f) apr_sdbm_close(f) -#define APR_DBM_FETCH(f, k, v) apr_sdbm_fetch(f, &v, *(k)) +#define APR_DBM_FETCH(f, k, v) apr_sdbm_fetch(f, &(v), *(k)) #define APR_DBM_STORE(f, k, v) apr_sdbm_store(f, *(k), *(v), APR_SDBM_REPLACE) #define APR_DBM_DELETE(f, k) apr_sdbm_delete(f, *(k)) -#define APR_DBM_FIRSTKEY(f, k) apr_sdbm_firstkey(f, &k) -#define APR_DBM_NEXTKEY(f, k, nk) apr_sdbm_nextkey(f, &nk) +#define APR_DBM_FIRSTKEY(f, k) apr_sdbm_firstkey(f, &(k)) +#define APR_DBM_NEXTKEY(f, k, nk) apr_sdbm_nextkey(f, &(nk)) #define APR_DBM_FREEDPTR(dptr) NOOP_FUNCTION #define APR_DBM_DBMODE_RO APR_READ
