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