archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix [-Wundef] warnings in DBA extension

Browse source
This commit is contained in:
George Peter Banyard 2020-08-07 20:15:38 +02:00
parent cd6c338c89
commit 738adce79f
28 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ext/dba/dba.c
View file

@ -21,7 +21,7 @@
#include "php.h" #include "php.h"
#if HAVE_DBA #ifdef HAVE_DBA
#include "php_ini.h" #include "php_ini.h"
#include <stdio.h> #include <stdio.h>
@ -160,72 +160,72 @@ static zend_string* php_dba_make_key(HashTable *key)
/* {{{ globals */ /* {{{ globals */
static dba_handler handler[] = { static dba_handler handler[] = {
#if DBA_GDBM #ifdef DBA_GDBM
DBA_HND(gdbm, DBA_LOCK_EXT) /* Locking done in library if set */ DBA_HND(gdbm, DBA_LOCK_EXT) /* Locking done in library if set */
#endif #endif
#if DBA_DBM #ifdef DBA_DBM
DBA_HND(dbm, DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(dbm, DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_NDBM #ifdef DBA_NDBM
DBA_HND(ndbm, DBA_LOCK_ALL) /* Could be done in library: filemode = 0644 + S_ENFMT */ DBA_HND(ndbm, DBA_LOCK_ALL) /* Could be done in library: filemode = 0644 + S_ENFMT */
#endif #endif
#if DBA_CDB #ifdef DBA_CDB
DBA_HND(cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_CDB_BUILTIN #ifdef DBA_CDB_BUILTIN
DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */ DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_DB1 #ifdef DBA_DB1
DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_DB2 #ifdef DBA_DB2
DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_DB3 #ifdef DBA_DB3
DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_DB4 #ifdef DBA_DB4
DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */ DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
#endif #endif
#if DBA_INIFILE #ifdef DBA_INIFILE
DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_CAST_AS_FD) /* No lock in lib */ DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_CAST_AS_FD) /* No lock in lib */
#endif #endif
#if DBA_FLATFILE #ifdef DBA_FLATFILE
DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_NO_APPEND) /* No lock in lib */ DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_NO_APPEND) /* No lock in lib */
#endif #endif
#if DBA_QDBM #ifdef DBA_QDBM
DBA_HND(qdbm, DBA_LOCK_EXT) DBA_HND(qdbm, DBA_LOCK_EXT)
#endif #endif
#if DBA_TCADB #ifdef DBA_TCADB
DBA_HND(tcadb, DBA_LOCK_ALL) DBA_HND(tcadb, DBA_LOCK_ALL)
#endif #endif
#if DBA_LMDB #ifdef DBA_LMDB
DBA_HND(lmdb, DBA_LOCK_EXT) DBA_HND(lmdb, DBA_LOCK_EXT)
#endif #endif
{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } { NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
}; };
#if DBA_FLATFILE #ifdef DBA_FLATFILE
#define DBA_DEFAULT "flatfile" #define DBA_DEFAULT "flatfile"
#elif DBA_DB4 #elif defined(DBA_DB4)
#define DBA_DEFAULT "db4" #define DBA_DEFAULT "db4"
#elif DBA_DB3 #elif defined(DBA_DB3)
#define DBA_DEFAULT "db3" #define DBA_DEFAULT "db3"
#elif DBA_DB2 #elif defined(DBA_DB2)
#define DBA_DEFAULT "db2" #define DBA_DEFAULT "db2"
#elif DBA_DB1 #elif defined(DBA_DB1)
#define DBA_DEFAULT "db1" #define DBA_DEFAULT "db1"
#elif DBA_GDBM #elif defined(DBA_GDBM)
#define DBA_DEFAULT "gdbm" #define DBA_DEFAULT "gdbm"
#elif DBA_NBBM #elif defined(DBA_NBBM)
#define DBA_DEFAULT "ndbm" #define DBA_DEFAULT "ndbm"
#elif DBA_DBM #elif defined(DBA_DBM)
#define DBA_DEFAULT "dbm" #define DBA_DEFAULT "dbm"
#elif DBA_QDBM #elif defined(DBA_QDBM)
#define DBA_DEFAULT "qdbm" #define DBA_DEFAULT "qdbm"
#elif DBA_TCADB #elif defined(DBA_TCADB)
#define DBA_DEFAULT "tcadb" #define DBA_DEFAULT "tcadb"
#elif DBA_LMDB #elif defined(DBA_LMDB)
#define DBA_DEFAULT "lmdb" #define DBA_DEFAULT "lmdb"
#else #else
#define DBA_DEFAULT "" #define DBA_DEFAULT ""

2
ext/dba/dba_cdb.c
View file

@ -21,7 +21,7 @@
#include "php.h" #include "php.h"
#if DBA_CDB #ifdef DBA_CDB
#include "php_cdb.h" #include "php_cdb.h"
#include <sys/types.h> #include <sys/types.h>

2
ext/dba/dba_db1.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_DB1 #ifdef DBA_DB1
#include "php_db1.h" #include "php_db1.h"
#ifdef DB1_INCLUDE_FILE #ifdef DB1_INCLUDE_FILE

2
ext/dba/dba_db2.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_DB2 #ifdef DBA_DB2
#include "php_db2.h" #include "php_db2.h"
#include <sys/stat.h> #include <sys/stat.h>

2
ext/dba/dba_db3.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_DB3 #ifdef DBA_DB3
#include "php_db3.h" #include "php_db3.h"
#include <sys/stat.h> #include <sys/stat.h>

2
ext/dba/dba_db4.c
View file

@ -21,7 +21,7 @@
#include "php.h" #include "php.h"
#if DBA_DB4 #ifdef DBA_DB4
#include "php_db4.h" #include "php_db4.h"
#include <sys/stat.h> #include <sys/stat.h>

4
ext/dba/dba_dbm.c
View file

@ -20,13 +20,13 @@
#include "php.h" #include "php.h"
#if DBA_DBM #ifdef DBA_DBM
#include "php_dbm.h" #include "php_dbm.h"
#ifdef DBM_INCLUDE_FILE #ifdef DBM_INCLUDE_FILE
#include DBM_INCLUDE_FILE #include DBM_INCLUDE_FILE
#endif #endif
#if DBA_GDBM #ifdef DBA_GDBM
#include "php_gdbm.h" #include "php_gdbm.h"
#endif #endif

2
ext/dba/dba_flatfile.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_FLATFILE #ifdef DBA_FLATFILE
#include "php_flatfile.h" #include "php_flatfile.h"
#include "libflatfile/flatfile.h" #include "libflatfile/flatfile.h"

2
ext/dba/dba_gdbm.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_GDBM #ifdef DBA_GDBM
#include "php_gdbm.h" #include "php_gdbm.h"
#ifdef GDBM_INCLUDE_FILE #ifdef GDBM_INCLUDE_FILE

2
ext/dba/dba_inifile.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_INIFILE #ifdef DBA_INIFILE
#include "php_inifile.h" #include "php_inifile.h"
#include "libinifile/inifile.h" #include "libinifile/inifile.h"

2
ext/dba/dba_lmdb.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_LMDB #ifdef DBA_LMDB
#include "php_lmdb.h" #include "php_lmdb.h"
#ifdef LMDB_INCLUDE_FILE #ifdef LMDB_INCLUDE_FILE

2
ext/dba/dba_ndbm.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_NDBM #ifdef DBA_NDBM
#include "php_ndbm.h" #include "php_ndbm.h"
#include <fcntl.h> #include <fcntl.h>

2
ext/dba/dba_qdbm.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_QDBM #ifdef DBA_QDBM
#include "php_qdbm.h" #include "php_qdbm.h"
#ifdef QDBM_INCLUDE_FILE #ifdef QDBM_INCLUDE_FILE

2
ext/dba/dba_tcadb.c
View file

@ -20,7 +20,7 @@
#include "php.h" #include "php.h"
#if DBA_TCADB #ifdef DBA_TCADB
#include "php_tcadb.h" #include "php_tcadb.h"
#ifdef TCADB_INCLUDE_FILE #ifdef TCADB_INCLUDE_FILE

2
ext/dba/php_cdb.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_CDB_H #ifndef PHP_CDB_H
#define PHP_CDB_H #define PHP_CDB_H
#if DBA_CDB #ifdef DBA_CDB
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_db1.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_DB1_H #ifndef PHP_DB1_H
#define PHP_DB1_H #define PHP_DB1_H
#if DBA_DB1 #ifdef DBA_DB1
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_db2.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_DB2_H #ifndef PHP_DB2_H
#define PHP_DB2_H #define PHP_DB2_H
#if DBA_DB2 #ifdef DBA_DB2
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_db3.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_DB3_H #ifndef PHP_DB3_H
#define PHP_DB3_H #define PHP_DB3_H
#if DBA_DB3 #ifdef DBA_DB3
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_db4.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_DB4_H #ifndef PHP_DB4_H
#define PHP_DB4_H #define PHP_DB4_H
#if DBA_DB4 #ifdef DBA_DB4
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_dba.h
View file

@ -20,7 +20,7 @@
#include "php_version.h" #include "php_version.h"
#define PHP_DBA_VERSION PHP_VERSION #define PHP_DBA_VERSION PHP_VERSION
#if HAVE_DBA #ifdef HAVE_DBA
typedef enum { typedef enum {
/* do not allow 0 here */ /* do not allow 0 here */

2
ext/dba/php_dbm.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_DBM_H #ifndef PHP_DBM_H
#define PHP_DBM_H #define PHP_DBM_H
#if DBA_DBM #ifdef DBA_DBM
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_flatfile.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_FLATFILE_H #ifndef PHP_FLATFILE_H
#define PHP_FLATFILE_H #define PHP_FLATFILE_H
#if DBA_FLATFILE #ifdef DBA_FLATFILE
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_gdbm.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_GDBM_H #ifndef PHP_GDBM_H
#define PHP_GDBM_H #define PHP_GDBM_H
#if DBA_GDBM #ifdef DBA_GDBM
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_inifile.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_INIFILE_H #ifndef PHP_INIFILE_H
#define PHP_INIFILE_H #define PHP_INIFILE_H
#if DBA_INIFILE #ifdef DBA_INIFILE
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_lmdb.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_LMDB_H #ifndef PHP_LMDB_H
#define PHP_LMDB_H #define PHP_LMDB_H
#if DBA_LMDB #ifdef DBA_LMDB
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_ndbm.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_NDBM_H #ifndef PHP_NDBM_H
#define PHP_NDBM_H #define PHP_NDBM_H
#if DBA_NDBM #ifdef DBA_NDBM
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_qdbm.h
View file

@ -1,7 +1,7 @@
#ifndef PHP_QDBM_H #ifndef PHP_QDBM_H
#define PHP_QDBM_H #define PHP_QDBM_H
#if DBA_QDBM #ifdef DBA_QDBM
#include "php_dba.h" #include "php_dba.h"

2
ext/dba/php_tcadb.h
View file

@ -17,7 +17,7 @@
#ifndef PHP_TCADB_H #ifndef PHP_TCADB_H
#define PHP_TCADB_H #define PHP_TCADB_H
#if DBA_TCADB #ifdef DBA_TCADB
#include "php_dba.h" #include "php_dba.h"