--- psiconv/trunk/lib/psiconv/generate_simple.c	2004/01/06 20:15:01	184
+++ psiconv/trunk/lib/psiconv/generate_simple.c	2004/02/25 20:57:10	231
@@ -1,6 +1,6 @@
 /*
     generate_simple.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2004  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@
 int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,
                      int lev,const psiconv_u8 value)
 {
-  psiconv_progress(config,lev,0,"Writing u8");
   return psiconv_buffer_add(buf,value);
 }
 
@@ -46,7 +45,6 @@
                       int lev,const psiconv_u16 value)
 {
   int res;
-  psiconv_progress(config,lev,0,"Writing u16");
   if ((res = psiconv_buffer_add(buf,value & 0xff))) 
 	return res;
   return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
@@ -56,7 +54,6 @@
                       int lev,const psiconv_u32 value)
 {
   int res;
-  psiconv_progress(config,lev,0,"Writing u32");
   if ((res = psiconv_buffer_add(buf,value & 0xff))) 
 	return res;
   if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 
@@ -103,21 +100,18 @@
 int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, 
                          int lev,const psiconv_length_t value)
 {
-  psiconv_progress(config,lev,0,"Writing length");
   return psiconv_write_u32(config,buf,lev+1,value * (1440.0/2.54) + 0.5);
 }
 
 int psiconv_write_size(const psiconv_config config,psiconv_buffer buf,
                        int lev, psiconv_size_t value)
 {
-  psiconv_progress(config,lev,0,"Writing size");
   return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5);
 }
 
 int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, 
                        int lev,const psiconv_bool_t value)
 {
-  psiconv_progress(config,lev,0,"Writing bool");
   if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 
     psiconv_warn(config,0,psiconv_buffer_length(buf),
                  "Boolean has non-enum value (found %d)",value);
@@ -127,22 +121,40 @@
 int psiconv_write_string(const psiconv_config config,psiconv_buffer buf,
                          int lev, const psiconv_string_t value)
 {
+  int res;
   psiconv_progress(config,lev,0,"Writing string");
-  return psiconv_write_string_aux(config,buf,lev+1,value,-1);
+  res = psiconv_write_string_aux(config,buf,lev+1,value,-1);
+  if (res)
+    psiconv_error(config,lev,0,"Writing of string failed");
+  else
+    psiconv_progress(config,lev,0,"End of string");
+  return res;
 }
 
 int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf, 
                                int lev,const psiconv_string_t value)
 {
+  int res;
   psiconv_progress(config,lev,0,"Writing short string");
-  return psiconv_write_string_aux(config,buf,lev+1,value,-2);
+  res = psiconv_write_string_aux(config,buf,lev+1,value,-2);
+  if (res)
+    psiconv_error(config,lev,0,"Writing of short string failed");
+  else
+    psiconv_progress(config,lev,0,"End of short string");
+  return res;
 }
 
 int psiconv_write_charlist(const psiconv_config config,psiconv_buffer buf, 
                            int lev,const psiconv_string_t value)
 {
-  psiconv_progress(config,lev,0,"Writing short string");
-  return psiconv_write_string_aux(config,buf,lev+1,value,0);
+  int res;
+  psiconv_progress(config,lev,0,"Writing charlist");
+  res = psiconv_write_string_aux(config,buf,lev+1,value,0);
+  if (res)
+    psiconv_error(config,lev,0,"Writing of charlist failed");
+  else
+    psiconv_progress(config,lev,0,"End of charlist");
+  return res;
 }
 
 
@@ -150,13 +162,10 @@
                              int lev, const psiconv_string_t value,int kind)
 {
   int res,i,len;
-  psiconv_u8 *output;
 
-  psiconv_progress(config,lev,0,"Writing string (auxiliary)");
   len = psiconv_unicode_strlen(value);
   if (!value) {
-    psiconv_error(config,0,psiconv_buffer_length(buf),
-                 "NULL string");
+    psiconv_error(config,lev,0, "NULL string");
     return -PSICONV_E_GENERATE;
   }
   if (kind == -1) 
@@ -168,21 +177,14 @@
   if (res)
     return res;
 
-  if ((res = psiconv_unicode_to_chars(config,value,&output)))
-    return res;
-
   for (i = 0; i < len; i++) 
-    if ((res = psiconv_write_u8(config,buf,lev+1,output[i]))) {
-      free(output);
+    if ((res = psiconv_unicode_write_char(config,buf,lev+1,value[i]))) 
       return res;
-    }
-  free(output);
   return -PSICONV_E_OK;
 }
 
 int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, 
                          int lev,psiconv_u32 id)
 {
-  psiconv_progress(config,lev,0,"Writing offset");
   return psiconv_buffer_add_reference(buf,id);
 }