From 69a93a05825230b049581dc2b142253a0348fb48 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Wed, 3 Mar 1999 17:02:10 +0000 Subject: [PATCH] function pointers are incompatible with `void *'; remove NULL or replace with 0 --- servers/slapd/back-ldbm/init.c | 2 +- servers/slapd/back-passwd/init.c | 40 +++++++++++++++---------------- servers/slapd/back-perl/init.c | 10 ++++---- servers/slapd/back-shell/init.c | 14 +++++------ servers/slapd/back-tcl/tcl_init.c | 6 ++--- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c index d2666cee2b..95947769dc 100644 --- a/servers/slapd/back-ldbm/init.c +++ b/servers/slapd/back-ldbm/init.c @@ -16,7 +16,7 @@ ldbm_back_initialize( ) { bi->bi_open = ldbm_back_open; - bi->bi_config = NULL; + bi->bi_config = 0; bi->bi_close = ldbm_back_close; bi->bi_destroy = ldbm_back_destroy; diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c index e6fd219369..ec01e90289 100644 --- a/servers/slapd/back-passwd/init.c +++ b/servers/slapd/back-passwd/init.c @@ -14,29 +14,29 @@ passwd_back_initialize( BackendInfo *bi ) { - bi->bi_open = NULL; - bi->bi_config = NULL; - bi->bi_close = NULL; - bi->bi_destroy = NULL; - - bi->bi_db_init = NULL; - bi->bi_db_config = NULL; - bi->bi_db_open = NULL; - bi->bi_db_close = NULL; - bi->bi_db_destroy = NULL; - - bi->bi_op_bind = NULL; - bi->bi_op_unbind = NULL; + bi->bi_open = 0; + bi->bi_config = 0; + bi->bi_close = 0; + bi->bi_destroy = 0; + + bi->bi_db_init = 0; + bi->bi_db_config = 0; + bi->bi_db_open = 0; + bi->bi_db_close = 0; + bi->bi_db_destroy = 0; + + bi->bi_op_bind = 0; + bi->bi_op_unbind = 0; bi->bi_op_search = passwd_back_search; - bi->bi_op_compare = NULL; - bi->bi_op_modify = NULL; - bi->bi_op_modrdn = NULL; - bi->bi_op_add = NULL; - bi->bi_op_delete = NULL; - bi->bi_op_abandon = NULL; + bi->bi_op_compare = 0; + bi->bi_op_modify = 0; + bi->bi_op_modrdn = 0; + bi->bi_op_add = 0; + bi->bi_op_delete = 0; + bi->bi_op_abandon = 0; #ifdef SLAPD_ACLGROUPS - bi->bi_acl_group = NULL; + bi->bi_acl_group = 0; #endif return 0; diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c index e3e41d8c72..560a1716c0 100644 --- a/servers/slapd/back-perl/init.c +++ b/servers/slapd/back-perl/init.c @@ -54,14 +54,14 @@ perl_back_initialize( perl_run(perl_interpreter); bi->bi_open = perl_back_open; - bi->bi_config = NULL; + bi->bi_config = 0; bi->bi_close = perl_back_close; bi->bi_destroy = perl_back_destroy; bi->bi_db_init = perl_back_db_init; bi->bi_db_config = perl_back_db_config; - bi->bi_db_open = NULL; - bi->bi_db_close = NULL; + bi->bi_db_open = 0; + bi->bi_db_close = 0; bi->bi_db_destroy = perl_back_db_destroy; bi->bi_op_bind = perl_back_bind; @@ -72,10 +72,10 @@ perl_back_initialize( bi->bi_op_modrdn = perl_back_modrdn; bi->bi_op_add = perl_back_add; bi->bi_op_delete = perl_back_delete; - bi->bi_op_abandon = NULL; + bi->bi_op_abandon = 0; #ifdef SLAPD_ACLGROUPS - bi->bi_acl_group = NULL; + bi->bi_acl_group = 0; #endif return 0; diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c index f0f1a93f6e..261c795210 100644 --- a/servers/slapd/back-shell/init.c +++ b/servers/slapd/back-shell/init.c @@ -14,15 +14,15 @@ shell_back_initialize( BackendInfo *bi ) { - bi->bi_open = NULL; - bi->bi_config = NULL; - bi->bi_close = NULL; - bi->bi_destroy = NULL; + bi->bi_open = 0; + bi->bi_config = 0; + bi->bi_close = 0; + bi->bi_destroy = 0; bi->bi_db_init = shell_back_db_init; bi->bi_db_config = shell_back_db_config; - bi->bi_db_open = NULL; - bi->bi_db_close = NULL; + bi->bi_db_open = 0; + bi->bi_db_close = 0; bi->bi_db_destroy = shell_back_db_destroy; bi->bi_op_bind = shell_back_bind; @@ -36,7 +36,7 @@ shell_back_initialize( bi->bi_op_abandon = shell_back_abandon; #ifdef SLAPD_ACLGROUPS - bi->bi_acl_group = NULL; + bi->bi_acl_group = 0; #endif return 0; diff --git a/servers/slapd/back-tcl/tcl_init.c b/servers/slapd/back-tcl/tcl_init.c index e7e71323b8..925ce14f41 100644 --- a/servers/slapd/back-tcl/tcl_init.c +++ b/servers/slapd/back-tcl/tcl_init.c @@ -1,6 +1,6 @@ /* tcl_init.c - tcl backend initialization * - * $Id: tcl_init.c,v 1.4 1999/02/18 01:18:39 bcollins Exp $ + * $Id: tcl_init.c,v 1.5 1999/02/20 07:53:48 hallvard Exp $ * * Copyright 1999, Ben Collins , All rights reserved. * @@ -39,7 +39,7 @@ tcl_back_initialize ( ldap_pvt_thread_mutex_init (&tcl_interpreter_mutex); bi->bi_open = tcl_back_open; - bi->bi_config = NULL; + bi->bi_config = 0; bi->bi_close = tcl_back_close; bi->bi_destroy = tcl_back_destroy; @@ -60,7 +60,7 @@ tcl_back_initialize ( bi->bi_op_abandon = tcl_back_abandon; #ifdef SLAPD_ACLGROUPS - bi->bi_acl_group = NULL; + bi->bi_acl_group = 0; #endif return 0; -- 2.39.5