function pointers are incompatible with `void *'; remove NULL or replace with 0

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 0e8330d76233fb46d0ea863b8ccde5bf0dbf4e94..7dcd020f920549314776e4d93e8f150b135a6811 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -115,7 +115,7 @@ do_add( Connection *conn, Operation *op )
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the updatedn.
         */
-       if ( be->be_add != NULL ) {
+       if ( be->be_add ) {
                /* do the update here */
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index b59e4c1d5890e805bc0897202c511e875fd54230..c0dc0fac917242c083c180b08a8c7e90dbaea8b9 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -352,7 +352,7 @@ be_db_close( void )
        int     i;
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].bd_info->bi_db_close != NULL ) {
+               if ( backends[i].bd_info->bi_db_close ) {
                        (*backends[i].bd_info->bi_db_close)( &backends[i] );
                }
        }
@@ -492,7 +492,7 @@ backend_unbind(
        int     i;
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].be_unbind != NULL ) {
+               if ( backends[i].be_unbind ) {
                        (*backends[i].be_unbind)( &backends[i], conn, op );
                }
        }

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 17790f739f5ff7d496475460d04a51d6e5c454e4..3e69c967e323fb46544c962c79bf1fb8e319884b 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -196,7 +196,7 @@ do_bind(
                return;
        }
 
-       if ( be->be_bind != NULL ) {
+       if ( be->be_bind ) {
                /* alias suffix */
                char *edn;
 

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index f6675d17ced811acb2df6cb84e9eec249d0fe43e..45461d56876c4c8a3eaba4ad95ea503b3a60312b 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -76,7 +76,7 @@ do_compare(
        /* alias suffix if approp */
        ndn = suffixAlias( ndn, op, be );
 
-       if ( be->be_compare != NULL ) {
+       if ( be->be_compare ) {
                (*be->be_compare)( be, conn, op, ndn, &ava );
        } else {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 74560b5a46ba50005f03db59c44a0e57ce272aa7..b02313b5cea80a278d19228788c011051459f7c5 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -514,7 +514,7 @@ read_config( char *fname )
                /* pass anything else to the current backend info/db config routine */
                } else {
                        if ( bi != NULL ) {
-                               if (bi->bi_config == NULL) {
+                               if ( bi->bi_config == 0 ) {
                                        Debug( LDAP_DEBUG_ANY,
 "%s: line %d: unknown directive \"%s\" inside backend info definition (ignored)\n",
                                                fname, lineno, cargv[0] );
@@ -526,7 +526,7 @@ read_config( char *fname )
                                        }
                                }
                        } else if ( be != NULL ) {
-                               if ( be->be_config == NULL ) {
+                               if ( be->be_config == 0 ) {
                                        Debug( LDAP_DEBUG_ANY,
 "%s: line %d: unknown directive \"%s\" inside backend database definition (ignored)\n",
                                        fname, lineno, cargv[0] );

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 66f68d9d89bbf96f0ca0b05d728a4f28ea470f3b..be9b1179eaf69e6ce34c5d3ede57f9e2bf03d70a 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -69,7 +69,7 @@ do_delete(
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the update_ndn.
         */
-       if ( be->be_delete != NULL ) {
+       if ( be->be_delete ) {
                /* do the update here */
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 7d07f9cb319a8535bdc3d39f184d2dfed6883ca5..daca60d6e16372d59093e7fdc7cae59f4c278cd5 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -152,7 +152,7 @@ do_modify(
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the update_ndn.
         */
-       if ( be->be_modify != NULL ) {
+       if ( be->be_modify ) {
                /* do the update here */
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 1a446db3bf6782d8995d91be219cb81cb7956918..f6656d466792b8195ff051be8fc7a30eb7c3ba1f 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -79,7 +79,7 @@ do_modrdn(
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the update_ndn.
         */
-       if ( be->be_modrdn != NULL ) {
+       if ( be->be_modrdn ) {
                /* do the update here */
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 2779fe0bdd8f4aa0e64f672c810e0a7d80224a12..3c1bce5336c84b628e5e3f76bb4bf7917fab8c71 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -145,7 +145,7 @@ do_search(
        base = suffixAlias ( base, op, be );
 
        /* actually do the search and send the result(s) */
-       if ( be->be_search != NULL ) {
+       if ( be->be_search ) {
                (*be->be_search)( be, conn, op, base, scope, deref, sizelimit,
                    timelimit, filter, fstr, attrs, attrsonly );
        } else {