Cleanup ISO C compatibility for recent commits

[openldap] / servers / slapd / back-monitor / rww.c

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index e8ae7bf6178ee44d81cbc3e3827e58746b471bc3..7571d320a0ff7348553dcc17f251ee68ac384675 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2011 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -86,7 +86,6 @@ monitor_subsys_rww_init(
        ep = &mp->mp_children;
 
        for ( i = 0; i < MONITOR_RWW_LAST; i++ ) {
-               char                    buf[ BACKMONITOR_BUFSIZE ];
                struct berval           nrdn, bv;
                Entry                   *e;
                
@@ -105,7 +104,7 @@ monitor_subsys_rww_init(
                ber_dupbv( &monitor_rww[ i ].nrdn, &nrdn );
        
                BER_BVSTR( &bv, "0" );
-               attr_merge_normalize_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
+               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
        
                mp = monitor_entrypriv_create();
                if ( mp == NULL ) {
@@ -163,7 +162,7 @@ monitor_subsys_rww_update(
        struct berval   nrdn;
 
        Attribute       *a;
-       char            buf[] = "+9223372036854775807L";
+       char            buf[LDAP_PVT_INTTYPE_CHARS(long)];
        long            num = 0;
        ber_len_t       len;