from jon@symas.com - misc cleanup

[openldap] / libraries / liblutil / base64.c

diff --git a/libraries/liblutil/base64.c b/libraries/liblutil/base64.c
index 0029dd16d4447296055fe6d659b9c23eec07880b..1ebd409afb48b9fe56bdc5d344997f46b8f7695e 100644 (file)
--- a/libraries/liblutil/base64.c
+++ b/libraries/liblutil/base64.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Modified by Kurt D. Zeilenga for inclusion into OpenLDAP
  */
@@ -46,6 +51,7 @@
 
 #include "portable.h"
 
+#include <ac/assert.h>
 #include <ac/stdlib.h>
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -55,8 +61,6 @@
 
 #include "lutil.h"
 
-#define Assert(Cond) if (!(Cond)) abort()
-
 static const char Base64[] =
        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static const char Pad64 = '=';
@@ -146,10 +150,10 @@ lutil_b64_ntop(
                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
                output[3] = input[2] & 0x3f;
-               Assert(output[0] < 64);
-               Assert(output[1] < 64);
-               Assert(output[2] < 64);
-               Assert(output[3] < 64);
+               assert(output[0] < 64);
+               assert(output[1] < 64);
+               assert(output[2] < 64);
+               assert(output[3] < 64);
 
                if (datalength + 4 > targsize)
                        return (-1);
@@ -169,9 +173,9 @@ lutil_b64_ntop(
                output[0] = input[0] >> 2;
                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-               Assert(output[0] < 64);
-               Assert(output[1] < 64);
-               Assert(output[2] < 64);
+               assert(output[0] < 64);
+               assert(output[1] < 64);
+               assert(output[2] < 64);
 
                if (datalength + 4 > targsize)
                        return (-1);