--- psiconv/trunk/lib/psiconv/generate_simple.c	2003/11/23 21:47:24	167
+++ psiconv/trunk/lib/psiconv/generate_simple.c	2003/11/25 17:57:05	168
@@ -17,6 +17,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <string.h>
+
 #include "config.h"
 #include "compat.h"
 
@@ -28,12 +30,12 @@
 #endif
 
 
-int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value)
+int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,const psiconv_u8 value)
 {
   return psiconv_buffer_add(buf,value);
 }
 
-int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value)
+int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,const psiconv_u16 value)
 {
   int res;
   if ((res = psiconv_buffer_add(buf,value & 0xff))) 
@@ -41,7 +43,7 @@
   return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
 }
 
-int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value)
+int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,const psiconv_u32 value)
 {
   int res;
   if ((res = psiconv_buffer_add(buf,value & 0xff))) 
@@ -53,71 +55,71 @@
   return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
 }
 
-int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value)
+int psiconv_write_S(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
 {
   if (value < 0x40) 
-    return psiconv_write_u8(buf,value * 4 + 2);
+    return psiconv_write_u8(config,buf,value * 4 + 2);
   else if (value < 0x2000) 
-    return psiconv_write_u16(buf,value * 8 + 3);
+    return psiconv_write_u16(config,buf,value * 8 + 3);
   else {
-    psiconv_warn(0,psiconv_buffer_length(buf),
+    psiconv_warn(config,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, const psiconv_u32 value)
+int psiconv_write_X(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
 {
   if (value < 0x80) 
-    return psiconv_write_u8(buf,value * 2);
+    return psiconv_write_u8(config,buf,value * 2);
   else if (value < 0x4000) 
-    return psiconv_write_u16(buf,value * 4 + 1);
+    return psiconv_write_u16(config,buf,value * 4 + 1);
   else if (value < 0x20000000) 
-    return psiconv_write_u16(buf,value * 8 + 3);
+    return psiconv_write_u16(config,buf,value * 8 + 3);
   else {
-    psiconv_warn(0,psiconv_buffer_length(buf),
+    psiconv_warn(config,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, const psiconv_length_t value)
+int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, const psiconv_length_t value)
 {
-  return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5);
+  return psiconv_write_u32(config,buf,value * (1440.0/2.54) + 0.5);
 }
 
-int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value)
+int psiconv_write_size(const psiconv_config config,psiconv_buffer buf, psiconv_size_t value)
 {
-  return psiconv_write_u32(buf,value * 20.0 + 0.5);
+  return psiconv_write_u32(config,buf,value * 20.0 + 0.5);
 }
 
-int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value)
+int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, const psiconv_bool_t value)
 {
   if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 
-    psiconv_warn(0,psiconv_buffer_length(buf),
+    psiconv_warn(config,0,psiconv_buffer_length(buf),
                  "Boolean has non-enum value (found %d)",value);
-  return psiconv_write_u8(buf,value == psiconv_bool_false?0:1);
+  return psiconv_write_u8(config,buf,value == psiconv_bool_false?0:1);
 }
 
-int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value)
+int psiconv_write_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value)
 {
   int res,i;
   if (!value) {
-    psiconv_warn(0,psiconv_buffer_length(buf),
+    psiconv_warn(config,0,psiconv_buffer_length(buf),
                  "NULL string");
     return -PSICONV_E_GENERATE;
   }
-  if ((res = psiconv_write_S(buf,strlen(value))))
+  if ((res = psiconv_write_S(config,buf,strlen(value))))
     return res;
   for (i = 0; i < strlen(value); i++) 
-    if ((res = psiconv_write_u8(buf,value[i])))
+    if ((res = psiconv_write_u8(config,buf,value[i])))
       return res;
   return -PSICONV_E_OK;
 }
 
-int psiconv_write_offset(psiconv_buffer buf, psiconv_u32 id)
+int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, psiconv_u32 id)
 {
   return psiconv_buffer_add_reference(buf,id);
 }