Cleanup since last patch (remove unused label)

[openldap] / libraries / liblber / idtest.c

diff --git a/libraries/liblber/idtest.c b/libraries/liblber/idtest.c
index cc747152c3376878f2b9d69757c1401506e0bed6..b48925a4501ac01cf29ace48d4e96c05669fadbb 100644 (file)
--- a/libraries/liblber/idtest.c
+++ b/libraries/liblber/idtest.c
@@ -1,10 +1,19 @@
 /* idtest.c - ber decoding test program using isode libraries */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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 in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,11 +23,16 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #ifdef HAVE_PSAP_H
 #include <psap.h>
@@ -35,29 +49,29 @@ main( int argc, char **argv )
        /* read the pe from standard in */
        if ( (psin = ps_alloc( std_open )) == NULLPS ) {
                perror( "ps_alloc" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        if ( std_setup( psin, stdin ) == NOTOK ) {
                perror( "std_setup" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        /* write the pe to standard out */
        if ( (psout = ps_alloc( std_open )) == NULLPS ) {
                perror( "ps_alloc" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        if ( std_setup( psout, stdout ) == NOTOK ) {
                perror( "std_setup" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        /* pretty print it to standard error */
        if ( (pserr = ps_alloc( std_open )) == NULLPS ) {
                perror( "ps_alloc" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        if ( std_setup( pserr, stderr ) == NOTOK ) {
                perror( "std_setup" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        while ( (pe = ps2pe( psin )) != NULLPE ) {
@@ -65,7 +79,7 @@ main( int argc, char **argv )
                pe2ps( psout, pe );
        }
 
-       exit( 0 );
+       exit( EXIT_SUCCESS );
 #else
        fprintf(stderr, "requires ISODE X.500 distribution.\n");
        return( EXIT_FAILURE );