Misc DESC updates

[openldap] / include / disptmpl.h

diff --git a/include/disptmpl.h b/include/disptmpl.h
index f5fc9e80a5091d8725b92989791002eed5372dc6..c5a858c72723580428b551d865aaeb80559979e9 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -1,11 +1,13 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, 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.
@@ -22,6 +24,8 @@
  * 7 March 1994 by Mark C Smith
  */
 
+/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */
+
 #ifndef _DISPTMPL_H
 #define _DISPTMPL_H
 
@@ -131,8 +135,6 @@ struct ldap_tmplitem {
 };
 
 
-#define NULLTMPLITEM   ((struct ldap_tmplitem *)0)
-
 #define LDAP_SET_TMPLITEM_APPDATA( ti, datap ) \
        ( (ti)->ti_appdata = (void *)(datap) )
 
@@ -151,8 +153,6 @@ struct ldap_oclist {
     struct ldap_oclist *oc_next;
 };
 
-#define NULLOCLIST     ((struct ldap_oclist *)0)
-
 
 /*
  * add defaults list
@@ -166,8 +166,6 @@ struct ldap_adddeflist {
     struct ldap_adddeflist     *ad_next;
 };
 
-#define NULLADLIST     ((struct ldap_adddeflist *)0)
-
 
 /*
  * display template global options
@@ -207,8 +205,6 @@ 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) )
 
@@ -229,14 +225,15 @@ 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 )
 ldap_init_templates LDAP_P(( char *file, struct ldap_disptmpl **tmpllistp ));
 
 LDAP_F( int )
 ldap_init_templates_buf LDAP_P(( char *buf,
-       long buflen,
+       ber_len_t buflen,
        struct ldap_disptmpl **tmpllistp ));
 
 LDAP_F( void )
@@ -283,40 +280,40 @@ LDAP_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 )
 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 )
 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 )
 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 )
 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 )
 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