/[public]/psiconv/trunk/lib/psiconv/generate_simple.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/generate_simple.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 231 Revision 232
… …
36 const psiconv_string_t value,int kind); 36 const psiconv_string_t value,int kind);
37 37
38int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf, 38int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,
39 int lev,const psiconv_u8 value) 39 int lev,const psiconv_u8 value)
40{ 40{
41 int res;
42 psiconv_progress(config,lev,0,"Writing u8");
43 psiconv_debug(config,lev+1,0,"Value: %02x",value);
41 return psiconv_buffer_add(buf,value); 44 res = psiconv_buffer_add(buf,value);
45 if (res)
46 psiconv_error(config,lev,0,"Out of memory error");
47 return res;
42} 48}
43 49
44int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf, 50int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,
45 int lev,const psiconv_u16 value) 51 int lev,const psiconv_u16 value)
46{ 52{
47 int res; 53 int res;
54 psiconv_progress(config,lev,0,"Writing u16");
55 psiconv_debug(config,lev+1,0,"Value: %04x",value);
48 if ((res = psiconv_buffer_add(buf,value & 0xff))) 56 if ((res = psiconv_buffer_add(buf,value & 0xff)))
57 goto ERROR;
58 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
59 goto ERROR;
60ERROR:
61 if (res)
62 psiconv_error(config,lev,0,"Out of memory error");
49 return res; 63 return res;
50 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
51} 64}
52 65
53int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf, 66int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,
54 int lev,const psiconv_u32 value) 67 int lev,const psiconv_u32 value)
55{ 68{
56 int res; 69 int res;
70 psiconv_progress(config,lev,0,"Writing u32");
71 psiconv_debug(config,lev+1,0,"Value: %08x",value);
72
57 if ((res = psiconv_buffer_add(buf,value & 0xff))) 73 if ((res = psiconv_buffer_add(buf,value & 0xff)))
58 return res; 74 goto ERROR;
59 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 75 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
60 return res; 76 goto ERROR;
61 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 77 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
62 return res; 78 goto ERROR;
63 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 79 if ((res = psiconv_buffer_add(buf,(value & 0xff000000) >> 24)))
80 goto ERROR;
81ERROR:
82 if (res)
83 psiconv_error(config,lev,0,"Out of memory error");
84 return res;
64} 85}
65 86
66int psiconv_write_S(const psiconv_config config,psiconv_buffer buf, 87int psiconv_write_S(const psiconv_config config,psiconv_buffer buf,
67 int lev,const psiconv_u32 value) 88 int lev,const psiconv_u32 value)
68{ 89{
90 int res;
91
69 psiconv_progress(config,lev,0,"Writing S"); 92 psiconv_progress(config,lev,0,"Writing S");
93 psiconv_debug(config,lev+1,0,"Value: %08x",value);
70 if (value < 0x40) 94 if (value < 0x40)
71 return psiconv_write_u8(config,buf,lev+1,value * 4 + 2); 95 res = psiconv_write_u8(config,buf,lev+2,value * 4 + 2);
72 else if (value < 0x2000) 96 else if (value < 0x2000)
73 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3); 97 res = psiconv_write_u16(config,buf,lev+2,value * 8 + 3);
74 else { 98 else {
75 psiconv_error(config,0,psiconv_buffer_length(buf), 99 psiconv_error(config,0,psiconv_buffer_length(buf),
76 "Don't know how to write S value larger than 0x2000 " 100 "Don't know how to write S value larger than 0x2000 "
77 "(trying %x)",value); 101 "(trying %x)",value);
78 return -PSICONV_E_GENERATE; 102 res = -PSICONV_E_GENERATE;
79 } 103 }
104 if (res)
105 psiconv_error(config,lev,0,"Writing of S failed");
106 else
107 psiconv_progress(config,lev,0,"End of S");
108 return res;
80} 109}
81 110
82int psiconv_write_X(const psiconv_config config,psiconv_buffer buf, 111int psiconv_write_X(const psiconv_config config,psiconv_buffer buf,
83 int lev, const psiconv_u32 value) 112 int lev, const psiconv_u32 value)
84{ 113{
114 int res;
85 psiconv_progress(config,lev,0,"Writing X"); 115 psiconv_progress(config,lev,0,"Writing X");
116 psiconv_debug(config,lev+1,0,"Value: %08x",value);
86 if (value < 0x80) 117 if (value < 0x80)
87 return psiconv_write_u8(config,buf,lev+1,value * 2); 118 res = psiconv_write_u8(config,buf,lev+2,value * 2);
88 else if (value < 0x4000) 119 else if (value < 0x4000)
89 return psiconv_write_u16(config,buf,lev+1,value * 4 + 1); 120 res = psiconv_write_u16(config,buf,lev+2,value * 4 + 1);
90 else if (value < 0x20000000) 121 else if (value < 0x20000000)
91 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3); 122 res = psiconv_write_u16(config,buf,lev+2,value * 8 + 3);
92 else { 123 else {
93 psiconv_error(config,0,psiconv_buffer_length(buf), 124 psiconv_error(config,lev,0,
94 "Don't know how to write X value larger than 0x20000000 " 125 "Don't know how to write X value larger than 0x20000000 "
95 "(trying %x)",value); 126 "(trying %x)",value);
96 return -PSICONV_E_GENERATE; 127 res = -PSICONV_E_GENERATE;
97 } 128 }
129 if (res)
130 psiconv_error(config,lev,0,"Writing of X failed");
131 else
132 psiconv_progress(config,lev,0,"End of X");
133 return res;
98} 134}
99 135
100int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, 136int psiconv_write_length(const psiconv_config config,psiconv_buffer buf,
101 int lev,const psiconv_length_t value) 137 int lev,const psiconv_length_t value)
102{ 138{
139 int res;
140 psiconv_progress(config,lev,0,"Writing length");
141 psiconv_debug(config,lev+1,0,"Value: %f",value);
103 return psiconv_write_u32(config,buf,lev+1,value * (1440.0/2.54) + 0.5); 142 res = psiconv_write_u32(config,buf,lev+2,value * (1440.0/2.54) + 0.5);
143 if (res)
144 psiconv_error(config,lev,0,"Writing of length failed");
145 else
146 psiconv_progress(config,lev,0,"End of length");
147 return res;
104} 148}
105 149
106int psiconv_write_size(const psiconv_config config,psiconv_buffer buf, 150int psiconv_write_size(const psiconv_config config,psiconv_buffer buf,
107 int lev, psiconv_size_t value) 151 int lev, psiconv_size_t value)
108{ 152{
153 int res;
154 psiconv_progress(config,lev,0,"Writing size");
155 psiconv_debug(config,lev+1,0,"Value: %f",value);
109 return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5); 156 res = psiconv_write_u32(config,buf,lev+2,value * 20.0 + 0.5);
157 if (res)
158 psiconv_error(config,lev,0,"Writing of size failed");
159 else
160 psiconv_progress(config,lev,0,"End of size");
161 return res;
110} 162}
111 163
112int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, 164int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf,
113 int lev,const psiconv_bool_t value) 165 int lev,const psiconv_bool_t value)
114{ 166{
167 int res;
168 psiconv_progress(config,lev,0,"Writing bool");
169 psiconv_debug(config,lev+1,0,"Value: %s",
170 value == psiconv_bool_false?"False":"True");
115 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 171 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
116 psiconv_warn(config,0,psiconv_buffer_length(buf), 172 psiconv_warn(config,0,psiconv_buffer_length(buf),
117 "Boolean has non-enum value (found %d)",value); 173 "Boolean has non-enum value (found %d, used true)",value);
118 return psiconv_write_u8(config,buf,lev+1,value == psiconv_bool_false?0:1); 174 res = psiconv_write_u8(config,buf,lev+2,value == psiconv_bool_false?0:1);
175 if (res)
176 psiconv_error(config,lev,0,"Writing of bool failed");
177 else
178 psiconv_progress(config,lev,0,"End of bool");
179 return res;
119} 180}
120 181
121int psiconv_write_string(const psiconv_config config,psiconv_buffer buf, 182int psiconv_write_string(const psiconv_config config,psiconv_buffer buf,
122 int lev, const psiconv_string_t value) 183 int lev, const psiconv_string_t value)
123{ 184{
… …
160 221
161int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf, 222int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf,
162 int lev, const psiconv_string_t value,int kind) 223 int lev, const psiconv_string_t value,int kind)
163{ 224{
164 int res,i,len; 225 int res,i,len;
226 char *printable;
165 227
166 len = psiconv_unicode_strlen(value); 228 len = psiconv_unicode_strlen(value);
167 if (!value) { 229 if (!value) {
168 psiconv_error(config,lev,0, "NULL string"); 230 psiconv_error(config,lev,0, "NULL string");
169 return -PSICONV_E_GENERATE; 231 return -PSICONV_E_GENERATE;
170 } 232 }
233
234 if (!(printable = psiconv_make_printable(config,value))) {
235 psiconv_error(config,lev,0,"Out of memory error");
236 return -PSICONV_E_NOMEM;
237 }
238 psiconv_debug(config,lev+1,0,"Value: %s",printable);
239 free(printable);
240
171 if (kind == -1) 241 if (kind == -1)
172 res = psiconv_write_S(config,buf,lev+1,len); 242 res = psiconv_write_S(config,buf,lev+2,len);
173 else if (kind == -2) 243 else if (kind == -2)
174 res = psiconv_write_u8(config,buf,lev+1,len); 244 res = psiconv_write_u8(config,buf,lev+2,len);
175 else 245 else
176 res = 0; 246 res = 0;
177 if (res) 247 if (res)
178 return res; 248 return res;
179 249
180 for (i = 0; i < len; i++) 250 for (i = 0; i < len; i++)
181 if ((res = psiconv_unicode_write_char(config,buf,lev+1,value[i]))) 251 if ((res = psiconv_unicode_write_char(config,buf,lev+2,value[i])))
182 return res; 252 return res;
183 return -PSICONV_E_OK; 253 return -PSICONV_E_OK;
184} 254}
185 255
186int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, 256int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf,
187 int lev,psiconv_u32 id) 257 int lev,psiconv_u32 id)
188{ 258{
259 int res;
260 psiconv_progress(config,lev,0,"Writing offset");
261 psiconv_debug(config,lev+1,0,"ID: %08x",id);
189 return psiconv_buffer_add_reference(buf,id); 262 res = psiconv_buffer_add_reference(buf,id);
263 if (res)
264 psiconv_error(config,lev,0,"Out of memory error");
265 return res;
190} 266}
Legend:
Removed from v.231  
changed lines
  Added in v.232
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26