--- psiconv/trunk/lib/psiconv/generate_simple.c	2000/12/22 22:31:50	71
+++ psiconv/trunk/lib/psiconv/generate_simple.c	2000/12/27 02:12:23	80
@@ -23,54 +23,46 @@
 #include "generate_routines.h"
 #include "error.h"
 
-int psiconv_write_u8(psiconv_buffer buf,psiconv_u8 value)
+int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value)
 {
-  return psiconv_list_add(buf,&value);
+  return psiconv_buffer_add(buf,value);
 }
 
-int psiconv_write_u16(psiconv_buffer buf,psiconv_u16 value)
+int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value)
 {
   int res;
-  psiconv_u8 temp;
-  temp = value & 0xff;
-  if ((res = psiconv_list_add(buf,&temp))) 
+  if ((res = psiconv_buffer_add(buf,value & 0xff))) 
 	return res;
-  temp = (value & 0xff0) >> 8;
-  return psiconv_list_add(buf,&temp);
+  return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
 }
 
-int psiconv_write_u32(psiconv_buffer buf,psiconv_u32 value)
+int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value)
 {
   int res;
-  psiconv_u8 temp;
-  temp = value & 0xff;
-  if ((res = psiconv_list_add(buf,&temp))) 
+  if ((res = psiconv_buffer_add(buf,value & 0xff))) 
 	return res;
-  temp = (value & 0xff00) >> 8;
-  if ((res = psiconv_list_add(buf,&temp))) 
+  if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 
 	return res;
-  temp = (value & 0xff0000) >> 16;
-  if ((res = psiconv_list_add(buf,&temp))) 
+  if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 
 	return res;
-  temp = (value & 0xff000000) >>24;
-  return psiconv_list_add(buf,&temp);
+  return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
 }
 
-int psiconv_write_S(psiconv_buffer buf, psiconv_u32 value)
+int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value)
 {
   if (value < 0x40) 
     return psiconv_write_u8(buf,value * 4 + 2);
   else if (value < 0x2000) 
     return psiconv_write_u16(buf,value * 8 + 3);
   else {
-    psiconv_warn(0,psiconv_list_length(buf),
+    psiconv_warn(0,psiconv_buffer_length(buf),
                  "Don't know how to write S value larger than 0x2000 "
                  "(trying %x)",value);
     return -PSICONV_E_GENERATE;
   }
 }
 
-int psiconv_write_X(psiconv_buffer buf, psiconv_u32 value)
+int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value)
 {
   if (value < 0x80) 
     return psiconv_write_u8(buf,value * 2);
@@ -79,14 +71,14 @@
   else if (value < 0x20000000) 
     return psiconv_write_u16(buf,value * 8 + 3);
   else {
-    psiconv_warn(0,psiconv_list_length(buf),
+    psiconv_warn(0,psiconv_buffer_length(buf),
                  "Don't know how to write X value larger than 0x20000000 "
                  "(trying %x)",value);
     return -PSICONV_E_GENERATE;
   }
 }
 
-int psiconv_write_length(psiconv_buffer buf, psiconv_length_t value)
+int psiconv_write_length(psiconv_buffer buf, const psiconv_length_t value)
 {
   return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5);
 }
@@ -96,14 +88,22 @@
   return psiconv_write_u32(buf,value * 20.0 + 0.5);
 }
 
-int psiconv_write_bool(psiconv_buffer buf, psiconv_bool_t value)
+int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value)
 {
-  return psiconv_write_u8(buf,value == psiconv_bool_true?1:0);
+  if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 
+    psiconv_warn(0,psiconv_buffer_length(buf),
+                 "Boolean has non-enum value (found %d)",value);
+  return psiconv_write_u8(buf,value == psiconv_bool_false?0:1);
 }
 
-int psiconv_write_string(psiconv_buffer buf, psiconv_string_t value)
+int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value)
 {
   int res,i;
+  if (!value) {
+    psiconv_warn(0,psiconv_buffer_length(buf),
+                 "NULL string");
+    return -PSICONV_E_GENERATE;
+  }
   if ((res = psiconv_write_S(buf,strlen(value))))
     return res;
   for (i = 0; i < strlen(value); i++) 
@@ -111,3 +111,8 @@
       return res;
   return -PSICONV_E_OK;
 }
+
+int psiconv_write_offset(psiconv_buffer buf, psiconv_u32 id)
+{
+  return psiconv_buffer_add_reference(buf,id);
+}