License, documentation, and memory fixes

[yaz-moved-to-github.git] / include / odr.h

diff --git a/include/odr.h b/include/odr.h
index fa59a53..20ee8c5 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -1,11 +1,33 @@
-

 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: odr.h,v $
  *
  * $Log: odr.h,v $

- * Revision 1.3  1995-05-15 11:55:54  quinn
+ * Revision 1.4  1995-05-16 08:50:33  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/05/15  11:55:54  quinn

  * Work on asynchronous activity.
  *
  * Revision 1.2  1995/04/18  08:14:37  quinn
  * Work on asynchronous activity.
  *
  * Revision 1.2  1995/04/18  08:14:37  quinn

@@ -251,7 +273,7 @@ void odr_release_mem(ODR_MEM p);
 /*
  * write a single character at the current position - grow buffer if
  * necessary.
 /*
  * write a single character at the current position - grow buffer if
  * necessary.

- * (no, we're not usually this anal about our macros, but this one is
+ * (no, we're not usually this anal about our macros, but this baby is

  *  next to unreadable without some indentation  :)
  */
 #define odr_putc(o, c) \
  *  next to unreadable without some indentation  :)
  */
 #define odr_putc(o, c) \

@@ -286,7 +308,7 @@ void odr_release_mem(ODR_MEM p);
 ) \
 
 #define odr_tell(o) ((o)->ecb.pos)
 ) \
 
 #define odr_tell(o) ((o)->ecb.pos)

-#define odr_ok(o) (!(o)->ecb.error)
+#define odr_ok(o) (!(o)->error)

 
 #define ODR_MAXNAME 256
 
 
 #define ODR_MAXNAME 256