cleanup old TOOLID macro

[openldap] / include / disptmpl.h

diff --git a/include/disptmpl.h b/include/disptmpl.h
index dc39dc39f633c078d90f0273b5fcfd9c2bf55d0d..c99ddb240baaa2e5ba99cdaa213f452feef1f0d8 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -1,4 +1,14 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+/* Portions
  * Copyright (c) 1993, 1994 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -122,16 +132,14 @@ struct ldap_tmplitem {
 };
 
 
-#define NULLTMPLITEM   ((struct ldap_tmplitem *)0)
-
 #define LDAP_SET_TMPLITEM_APPDATA( ti, datap ) \
-       (ti)->ti_appdata = (void *)(datap)
+       ( (ti)->ti_appdata = (void *)(datap) )
 
 #define LDAP_GET_TMPLITEM_APPDATA( ti, type )  \
-       (type)((ti)->ti_appdata)
+       ( (type)((ti)->ti_appdata) )
 
 #define LDAP_IS_TMPLITEM_OPTION_SET( ti, option )      \
-       (((ti)->ti_options & option ) != 0 )
+       ( ((ti)->ti_options & (option) ) != 0 )
 
 
 /*
@@ -142,8 +150,6 @@ struct ldap_oclist {
     struct ldap_oclist *oc_next;
 };
 
-#define NULLOCLIST     ((struct ldap_oclist *)0)
-
 
 /*
  * add defaults list
@@ -157,8 +163,6 @@ struct ldap_adddeflist {
     struct ldap_adddeflist     *ad_next;
 };
 
-#define NULLADLIST     ((struct ldap_adddeflist *)0)
-
 
 /*
  * display template global options
@@ -198,16 +202,14 @@ struct ldap_disptmpl {
     struct ldap_disptmpl       *dt_next;
 };
 
-#define NULLDISPTMPL   ((struct ldap_disptmpl *)0)
-
 #define LDAP_SET_DISPTMPL_APPDATA( dt, datap ) \
-       (dt)->dt_appdata = (void *)(datap)
+       ( (dt)->dt_appdata = (void *)(datap) )
 
 #define LDAP_GET_DISPTMPL_APPDATA( dt, type )  \
-       (type)((dt)->dt_appdata)
+       ( (type)((dt)->dt_appdata) )
 
 #define LDAP_IS_DISPTMPL_OPTION_SET( dt, option )      \
-       (((dt)->dt_options & option ) != 0 )
+       ( ((dt)->dt_options & (option) ) != 0 )
 
 #define LDAP_TMPL_ERR_VERSION  1
 #define LDAP_TMPL_ERR_MEM      2
@@ -220,94 +222,95 @@ struct ldap_disptmpl {
 #define LDAP_DTMPL_BUFSIZ      8192
 
 
-typedef int (*writeptype) LDAP_P(( void *writeparm, char *p, int len ));
+typedef int (*ldap_writeptype) LDAP_P((
+       void *writeparm, char *p, ber_len_t len ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_init_templates LDAP_P(( char *file, struct ldap_disptmpl **tmpllistp ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_init_templates_buf LDAP_P(( char *buf,
-       long buflen,
+       ber_len_t buflen,
        struct ldap_disptmpl **tmpllistp ));
 
-LDAP_F void
+LIBLDAP_F( void )
 ldap_free_templates LDAP_P(( struct ldap_disptmpl *tmpllist ));
 
-LDAP_F struct ldap_disptmpl *
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_first_disptmpl LDAP_P(( struct ldap_disptmpl *tmpllist ));
 
-LDAP_F struct ldap_disptmpl *
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_next_disptmpl LDAP_P(( struct ldap_disptmpl *tmpllist,
        struct ldap_disptmpl *tmpl ));
 
-LDAP_F struct ldap_disptmpl *
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_name2template LDAP_P(( char *name,
        struct ldap_disptmpl *tmpllist ));
 
-LDAP_F struct ldap_disptmpl *
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_oc2template LDAP_P(( char **oclist,
        struct ldap_disptmpl *tmpllist ));
 
-LDAP_F char **
+LIBLDAP_F( char ** )
 ldap_tmplattrs LDAP_P(( struct ldap_disptmpl *tmpl,
        char **includeattrs,
        int exclude,
        unsigned long syntaxmask ));
 
-LDAP_F struct ldap_tmplitem *
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_first_tmplrow LDAP_P(( struct ldap_disptmpl *tmpl ));
 
-LDAP_F struct ldap_tmplitem *
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_next_tmplrow LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row ));
 
-LDAP_F struct ldap_tmplitem *
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_first_tmplcol LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row ));
 
-LDAP_F struct ldap_tmplitem *
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_next_tmplcol LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row,
        struct ldap_tmplitem *col ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_entry2text LDAP_P(( LDAP *ld,
        char *buf, LDAPMessage *entry,
        struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
-       writeptype writeproc, void *writeparm, char *eol, int rdncount,
+       ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_vals2text LDAP_P(( LDAP *ld,
        char *buf, char **vals, char *label, int labelwidth,
-       unsigned long syntaxid, writeptype writeproc, void *writeparm,
+       unsigned long syntaxid, ldap_writeptype writeproc, void *writeparm,
        char *eol, int rdncount ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_entry2text_search LDAP_P(( LDAP *ld,
        char *dn, char *base, LDAPMessage *entry,
        struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
-       writeptype writeproc, void *writeparm, char *eol, int rdncount,
+       ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_entry2html LDAP_P(( LDAP *ld,
        char *buf, LDAPMessage *entry,
        struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
-       writeptype writeproc, void *writeparm, char *eol, int rdncount,
+       ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts, char *urlprefix, char *base ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_vals2html LDAP_P(( LDAP *ld,
        char *buf, char **vals, char *label, int labelwidth,
-       unsigned long syntaxid, writeptype writeproc, void *writeparm,
+       unsigned long syntaxid, ldap_writeptype writeproc, void *writeparm,
        char *eol, int rdncount, char *urlprefix ));
 
-LDAP_F int
+LIBLDAP_F( int )
 ldap_entry2html_search LDAP_P(( LDAP
        *ld, char *dn, char *base, LDAPMessage *entry,
        struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
-       writeptype writeproc, void *writeparm, char *eol, int rdncount,
+       ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts, char *urlprefix ));
 
 LDAP_END_DECL