From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 9 Mar 1999 00:50:41 +0000 (+0000)
Subject: Add LDIF_ to LINE_WIDTH
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~438
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53fc115b6f56af3f1c4cddf7916ca1f828758a3f;p=openldap

Add LDIF_ to LINE_WIDTH
---

diff --git a/include/ldif.h b/include/ldif.h
index 139d6ba749..691c8bb52f 100644
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -28,7 +28,7 @@ LDAP_BEGIN_DECL
 
 extern int ldif_debug;
 
-#define LINE_WIDTH      76      /* maximum length of LDIF lines */
+#define LDIF_LINE_WIDTH      76      /* maximum length of LDIF lines */
 
 /*
  * Macro to calculate maximum number of bytes that the base64 equivalent
@@ -45,7 +45,7 @@ extern int ldif_debug;
  */
 #define LDIF_SIZE_NEEDED(tlen,vlen) \
     ((tlen) + 4 + LDIF_BASE64_LEN(vlen) \
-    + ((LDIF_BASE64_LEN(vlen) + (tlen) + 3) / LINE_WIDTH * 2 ))
+    + ((LDIF_BASE64_LEN(vlen) + (tlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
 LDAP_F int
 ldif_parse_line LDAP_P(( char *line, char **type, char **value, int *vlen));
diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index d0af5ae29b..ed53d70817 100644
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -228,7 +228,7 @@ ldif_put_type_and_value( char **out, char *t, char *val, int vlen )
 				b64 = 1;
 				break;
 			}
-			if ( len > LINE_WIDTH ) {
+			if ( len > LDIF_LINE_WIDTH ) {
 				*(*out)++ = '\n';
 				*(*out)++ = ' ';
 				len = 1;
@@ -249,7 +249,7 @@ ldif_put_type_and_value( char **out, char *t, char *val, int vlen )
 			bits |= (byte[2] & 0xff);
 
 			for ( i = 0; i < 4; i++, len++, bits <<= 6 ) {
-				if ( len > LINE_WIDTH ) {
+				if ( len > LDIF_LINE_WIDTH ) {
 					*(*out)++ = '\n';
 					*(*out)++ = ' ';
 					len = 1;
@@ -274,7 +274,7 @@ ldif_put_type_and_value( char **out, char *t, char *val, int vlen )
 			bits |= (byte[2] & 0xff);
 
 			for ( i = 0; i < 4; i++, len++, bits <<= 6 ) {
-				if ( len > LINE_WIDTH ) {
+				if ( len > LDIF_LINE_WIDTH ) {
 					*(*out)++ = '\n';
 					*(*out)++ = ' ';
 					len = 1;