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

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

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

Revision 167 Revision 168
40 for (i = 0; i < (n<0?-n:n); i++) 40 for (i = 0; i < (n<0?-n:n); i++)
41 res *= 2.0; 41 res *= 2.0;
42 42
43 return n<0?1/res:res; 43 return n<0?1/res:res;
44} 44}
45psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev,psiconv_u32 off, 45psiconv_u8 psiconv_read_u8(const psiconv_config config,const psiconv_buffer buf,int lev,psiconv_u32 off,
46 int *status) 46 int *status)
47{ 47{
48 psiconv_u8 *ptr; 48 psiconv_u8 *ptr;
49 ptr = psiconv_buffer_get(buf,off); 49 ptr = psiconv_buffer_get(buf,off);
50 if (!ptr) { 50 if (!ptr) {
51 psiconv_warn(lev,off,"Trying byte read past the end of the file"); 51 psiconv_warn(config,lev,off,"Trying byte read past the end of the file");
52 if (status) 52 if (status)
53 *status = -PSICONV_E_PARSE; 53 *status = -PSICONV_E_PARSE;
54 return 0; 54 return 0;
55 } 55 }
56 if (status) 56 if (status)
57 *status = 0; 57 *status = 0;
58 return *ptr; 58 return *ptr;
59} 59}
60 60
61psiconv_u16 psiconv_read_u16(const psiconv_buffer buf,int lev,psiconv_u32 off, 61psiconv_u16 psiconv_read_u16(const psiconv_config config,const psiconv_buffer buf,int lev,psiconv_u32 off,
62 int *status) 62 int *status)
63{ 63{
64 psiconv_u8 *ptr0,*ptr1; 64 psiconv_u8 *ptr0,*ptr1;
65 ptr0 = psiconv_buffer_get(buf,off); 65 ptr0 = psiconv_buffer_get(buf,off);
66 ptr1 = psiconv_buffer_get(buf,off+1); 66 ptr1 = psiconv_buffer_get(buf,off+1);
67 if (!ptr0 || !ptr1) { 67 if (!ptr0 || !ptr1) {
68 psiconv_warn(lev,off,"Trying word read past the end of the file"); 68 psiconv_warn(config,lev,off,"Trying word read past the end of the file");
69 if (status) 69 if (status)
70 *status = -PSICONV_E_PARSE; 70 *status = -PSICONV_E_PARSE;
71 return 0; 71 return 0;
72 } 72 }
73 if (status) 73 if (status)
74 *status = 0; 74 *status = 0;
75 return *ptr0 + (*ptr1 << 8); 75 return *ptr0 + (*ptr1 << 8);
76} 76}
77 77
78psiconv_u32 psiconv_read_u32(const psiconv_buffer buf,int lev,psiconv_u32 off, 78psiconv_u32 psiconv_read_u32(const psiconv_config config,const psiconv_buffer buf,int lev,psiconv_u32 off,
79 int *status) 79 int *status)
80{ 80{
81 psiconv_u8 *ptr0,*ptr1,*ptr2,*ptr3; 81 psiconv_u8 *ptr0,*ptr1,*ptr2,*ptr3;
82 ptr0 = psiconv_buffer_get(buf,off); 82 ptr0 = psiconv_buffer_get(buf,off);
83 ptr1 = psiconv_buffer_get(buf,off+1); 83 ptr1 = psiconv_buffer_get(buf,off+1);
84 ptr2 = psiconv_buffer_get(buf,off+2); 84 ptr2 = psiconv_buffer_get(buf,off+2);
85 ptr3 = psiconv_buffer_get(buf,off+3); 85 ptr3 = psiconv_buffer_get(buf,off+3);
86 if (!ptr0 || !ptr1 || !ptr2 || !ptr3) { 86 if (!ptr0 || !ptr1 || !ptr2 || !ptr3) {
87 psiconv_warn(lev,off,"Trying long read past the end of the file"); 87 psiconv_warn(config,lev,off,"Trying long read past the end of the file");
88 if (status) 88 if (status)
89 *status = -PSICONV_E_PARSE; 89 *status = -PSICONV_E_PARSE;
90 return 0; 90 return 0;
91 } 91 }
92 if (status) 92 if (status)
93 *status = 0; 93 *status = 0;
94 return *ptr0 + (*ptr1 << 8) + (*ptr2 << 16) + (*ptr3 << 24); 94 return *ptr0 + (*ptr1 << 8) + (*ptr2 << 16) + (*ptr3 << 24);
95} 95}
96 96
97psiconv_s32 psiconv_read_sint(const psiconv_buffer buf,int lev,psiconv_u32 off, 97psiconv_s32 psiconv_read_sint(const psiconv_config config,const psiconv_buffer buf,int lev,psiconv_u32 off,
98 int *length,int *status) 98 int *length,int *status)
99{ 99{
100 int localstatus; 100 int localstatus;
101 psiconv_u32 temp; 101 psiconv_u32 temp;
102 102
103 temp=psiconv_read_u32(buf,lev,off,&localstatus); 103 temp=psiconv_read_u32(config,buf,lev,off,&localstatus);
104 if (status) 104 if (status)
105 *status = localstatus; 105 *status = localstatus;
106 if (length) 106 if (length)
107 *length = localstatus?0:4; 107 *length = localstatus?0:4;
108 108
109 return localstatus?0:(temp & 0x7fffffff)*(temp&0x80000000?-1:1); 109 return localstatus?0:(temp & 0x7fffffff)*(temp&0x80000000?-1:1);
110} 110}
111 111
112psiconv_S_t psiconv_read_S(const psiconv_buffer buf, int lev, psiconv_u32 off, 112psiconv_S_t psiconv_read_S(const psiconv_config config,const psiconv_buffer buf, int lev, psiconv_u32 off,
113 int *length,int *status) 113 int *length,int *status)
114{ 114{
115 psiconv_u8 temp; 115 psiconv_u8 temp;
116 psiconv_S_t res; 116 psiconv_S_t res;
117 int len,localstatus; 117 int len,localstatus;
118 118
119 psiconv_progress(lev+1,off,"Going to read a S length indicator"); 119 psiconv_progress(config,lev+1,off,"Going to read a S length indicator");
120 temp = psiconv_read_u8(buf,lev+2,off,&localstatus); 120 temp = psiconv_read_u8(config,buf,lev+2,off,&localstatus);
121 if (localstatus) 121 if (localstatus)
122 goto ERROR; 122 goto ERROR;
123 if ((temp & 0x03) == 0x02) { 123 if ((temp & 0x03) == 0x02) {
124 res = psiconv_read_u8(buf,lev+2,off,&localstatus) >> 2; 124 res = psiconv_read_u8(config,buf,lev+2,off,&localstatus) >> 2;
125 if (localstatus) 125 if (localstatus)
126 goto ERROR; 126 goto ERROR;
127 len = 1; 127 len = 1;
128 psiconv_debug(lev+2,off,"Indicator (1 byte): %02x",res); 128 psiconv_debug(config,lev+2,off,"Indicator (1 byte): %02x",res);
129 } else if ((temp & 0x07) == 0x05) { 129 } else if ((temp & 0x07) == 0x05) {
130 res = psiconv_read_u16(buf,lev+2,off,&localstatus) >> 3; 130 res = psiconv_read_u16(config,buf,lev+2,off,&localstatus) >> 3;
131 if (localstatus) 131 if (localstatus)
132 goto ERROR; 132 goto ERROR;
133 len = 2; 133 len = 2;
134 psiconv_debug(lev+2,off,"Indicator (2 bytes): %04x",res); 134 psiconv_debug(config,lev+2,off,"Indicator (2 bytes): %04x",res);
135 } else { 135 } else {
136 psiconv_warn(lev+2,off,"S indicator: unknown encoding!"); 136 psiconv_warn(config,lev+2,off,"S indicator: unknown encoding!");
137 psiconv_debug(lev+2,off,"Raw data first byte: %02x",temp); 137 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp);
138 goto ERROR; 138 goto ERROR;
139 } 139 }
140 140
141 if (length) 141 if (length)
142 *length = len; 142 *length = len;
143 if (status) 143 if (status)
144 *status = 0; 144 *status = 0;
145 145
146 psiconv_progress(lev+1,off+len-1, 146 psiconv_progress(config,lev+1,off+len-1,
147 "End of S length indicator (total length: %08x)", len); 147 "End of S length indicator (total length: %08x)", len);
148 148
149 return res; 149 return res;
150 150
151ERROR: 151ERROR:
152 psiconv_warn(lev+1,off,"Reading of S indicator failed"); 152 psiconv_warn(config,lev+1,off,"Reading of S indicator failed");
153 if (status) 153 if (status)
154 *status = localstatus; 154 *status = localstatus;
155 if (length) 155 if (length)
156 *length = 0; 156 *length = 0;
157 return 0; 157 return 0;
158} 158}
159 159
160psiconv_X_t psiconv_read_X(const psiconv_buffer buf, int lev, psiconv_u32 off, 160psiconv_X_t psiconv_read_X(const psiconv_config config,const psiconv_buffer buf, int lev, psiconv_u32 off,
161 int *length, int *status) 161 int *length, int *status)
162{ 162{
163 psiconv_u8 temp; 163 psiconv_u8 temp;
164 psiconv_X_t res; 164 psiconv_X_t res;
165 int len,localstatus; 165 int len,localstatus;
166 166
167 psiconv_progress(lev+1,off,"Going to read a X length indicator"); 167 psiconv_progress(config,lev+1,off,"Going to read a X length indicator");
168 temp = psiconv_read_u8(buf,lev+2,off,&localstatus); 168 temp = psiconv_read_u8(config,buf,lev+2,off,&localstatus);
169 if (localstatus) 169 if (localstatus)
170 goto ERROR; 170 goto ERROR;
171 if ((temp & 0x01) == 0x00) { 171 if ((temp & 0x01) == 0x00) {
172 res = psiconv_read_u8(buf,lev+2,off,&localstatus) >> 1; 172 res = psiconv_read_u8(config,buf,lev+2,off,&localstatus) >> 1;
173 if (localstatus) 173 if (localstatus)
174 goto ERROR; 174 goto ERROR;
175 len = 1; 175 len = 1;
176 psiconv_debug(lev+2,off,"Indicator (1 byte): %02x",res); 176 psiconv_debug(config,lev+2,off,"Indicator (1 byte): %02x",res);
177 } else if ((temp & 0x03) == 0x01) { 177 } else if ((temp & 0x03) == 0x01) {
178 res = psiconv_read_u16(buf,lev+2,off,&localstatus) >> 2; 178 res = psiconv_read_u16(config,buf,lev+2,off,&localstatus) >> 2;
179 if (localstatus) 179 if (localstatus)
180 goto ERROR; 180 goto ERROR;
181 len = 2; 181 len = 2;
182 psiconv_debug(lev+2,off,"Indicator (2 bytes): %04x",res); 182 psiconv_debug(config,lev+2,off,"Indicator (2 bytes): %04x",res);
183 } else if ((temp & 0x07) == 0x03) { 183 } else if ((temp & 0x07) == 0x03) {
184 res = psiconv_read_u32(buf,lev+2,off,&localstatus) >> 3; 184 res = psiconv_read_u32(config,buf,lev+2,off,&localstatus) >> 3;
185 if (localstatus) 185 if (localstatus)
186 goto ERROR; 186 goto ERROR;
187 len = 4; 187 len = 4;
188 psiconv_debug(lev+2,off,"Indicator (4 bytes): %08x",res); 188 psiconv_debug(config,lev+2,off,"Indicator (4 bytes): %08x",res);
189 } else { 189 } else {
190 psiconv_warn(lev+2,off,"X indicator: unknown encoding!"); 190 psiconv_warn(config,lev+2,off,"X indicator: unknown encoding!");
191 psiconv_debug(lev+2,off,"Raw data first byte: %02x",temp); 191 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp);
192 goto ERROR; 192 goto ERROR;
193 } 193 }
194 194
195 if (length) 195 if (length)
196 *length = len; 196 *length = len;
197 if (status) 197 if (status)
198 *status = 0; 198 *status = 0;
199 199
200 psiconv_progress(lev+1,off+len-1, 200 psiconv_progress(config,lev+1,off+len-1,
201 "End of X length indicator (total length: %08x)", len); 201 "End of X length indicator (total length: %08x)", len);
202 202
203 return res; 203 return res;
204 204
205ERROR: 205ERROR:
206 psiconv_warn(lev+1,off,"Reading of X indicator failed"); 206 psiconv_warn(config,lev+1,off,"Reading of X indicator failed");
207 if (status) 207 if (status)
208 *status = localstatus; 208 *status = localstatus;
209 if (length) 209 if (length)
210 *length = 0; 210 *length = 0;
211 return 0; 211 return 0;
212} 212}
213 213
214psiconv_length_t psiconv_read_length(const psiconv_buffer buf, int lev, 214psiconv_length_t psiconv_read_length(const psiconv_config config,const psiconv_buffer buf, int lev,
215 psiconv_u32 off, int *length, int *status) 215 psiconv_u32 off, int *length, int *status)
216{ 216{
217 psiconv_length_t res; 217 psiconv_length_t res;
218 int localstatus; 218 int localstatus;
219 219
220 res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(buf,lev,off, 220 res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(config,buf,lev,off,
221 &localstatus)); 221 &localstatus));
222 if (localstatus) { 222 if (localstatus) {
223 psiconv_warn(lev+1,off,"Reading of length failed"); 223 psiconv_warn(config,lev+1,off,"Reading of length failed");
224 if (length) 224 if (length)
225 *length = 0; 225 *length = 0;
226 if (status) 226 if (status)
227 *status = localstatus; 227 *status = localstatus;
228 return 0; 228 return 0;
229 } 229 }
230 psiconv_debug(lev+1,off,"Length: %f",res); 230 psiconv_debug(config,lev+1,off,"Length: %f",res);
231 if (length) 231 if (length)
232 *length = 4; 232 *length = 4;
233 if (status) 233 if (status)
234 *status = 0; 234 *status = 0;
235 return res; 235 return res;
236} 236}
237 237
238psiconv_size_t psiconv_read_size(const psiconv_buffer buf, int lev, 238psiconv_size_t psiconv_read_size(const psiconv_config config,const psiconv_buffer buf, int lev,
239 psiconv_u32 off, int *length, int *status) 239 psiconv_u32 off, int *length, int *status)
240{ 240{
241 psiconv_size_t res; 241 psiconv_size_t res;
242 int localstatus; 242 int localstatus;
243 res = ((psiconv_s32) psiconv_read_u32(buf,lev,off,&localstatus)) / 20.0; 243 res = ((psiconv_s32) psiconv_read_u32(config,buf,lev,off,&localstatus)) / 20.0;
244 if (localstatus) { 244 if (localstatus) {
245 psiconv_warn(lev+1,off,"Reading of size failed"); 245 psiconv_warn(config,lev+1,off,"Reading of size failed");
246 if (length) 246 if (length)
247 *length = 0; 247 *length = 0;
248 if (status) 248 if (status)
249 *status = localstatus; 249 *status = localstatus;
250 return 0; 250 return 0;
251 } 251 }
252 psiconv_debug(lev+1,off,"Size: %f",res); 252 psiconv_debug(config,lev+1,off,"Size: %f",res);
253 if (status) 253 if (status)
254 *status = 0; 254 *status = 0;
255 if (length) 255 if (length)
256 *length = 4; 256 *length = 4;
257 return res; 257 return res;
258} 258}
259 259
260int psiconv_parse_bool(const psiconv_buffer buf, int lev, psiconv_u32 off, 260int psiconv_parse_bool(const psiconv_config config,const psiconv_buffer buf, int lev, psiconv_u32 off,
261 int *length, psiconv_bool_t *result) 261 int *length, psiconv_bool_t *result)
262{ 262{
263 psiconv_u8 temp; 263 psiconv_u8 temp;
264 int localstatus; 264 int localstatus;
265 temp = psiconv_read_u8(buf,lev,off,&localstatus); 265 temp = psiconv_read_u8(config,buf,lev,off,&localstatus);
266 if (localstatus) { 266 if (localstatus) {
267 psiconv_warn(lev+1,off,"Reading of bool failed"); 267 psiconv_warn(config,lev+1,off,"Reading of bool failed");
268 if (length) 268 if (length)
269 *length = 0; 269 *length = 0;
270 return localstatus; 270 return localstatus;
271 } 271 }
272 if (length) 272 if (length)
276 return 0; 276 return 0;
277 } else if (temp == 1) { 277 } else if (temp == 1) {
278 *result = psiconv_bool_true; 278 *result = psiconv_bool_true;
279 return 0; 279 return 0;
280 } 280 }
281 psiconv_warn(lev+1,off,"Unknown value for boolean"); 281 psiconv_warn(config,lev+1,off,"Unknown value for boolean");
282 psiconv_debug(lev+1,off,"Boolean value: %02x",temp); 282 psiconv_debug(config,lev+1,off,"Boolean value: %02x",temp);
283 *result = psiconv_bool_true; 283 *result = psiconv_bool_true;
284 return 0; 284 return 0;
285} 285}
286 286
287psiconv_string_t psiconv_read_string(const psiconv_buffer buf,int lev, 287psiconv_string_t psiconv_read_string(const psiconv_config config,const psiconv_buffer buf,int lev,
288 psiconv_u32 off,int *length, int *status) 288 psiconv_u32 off,int *length, int *status)
289{ 289{
290 int stringlen,i,leng,len,localstatus; 290 int stringlen,i,leng,len,localstatus;
291 psiconv_string_t result; 291 psiconv_string_t result;
292 char *res_copy; 292 char *res_copy;
293 293
294 psiconv_progress(lev+1,off,"Going to read a string"); 294 psiconv_progress(config,lev+1,off,"Going to read a string");
295 295
296 stringlen = psiconv_read_S(buf,lev+2,off,&leng,&localstatus); 296 stringlen = psiconv_read_S(config,buf,lev+2,off,&leng,&localstatus);
297 if (localstatus) 297 if (localstatus)
298 goto ERROR1; 298 goto ERROR1;
299 psiconv_debug(lev+2,off,"Length: %i",stringlen); 299 psiconv_debug(config,lev+2,off,"Length: %i",stringlen);
300 len = leng; 300 len = leng;
301 301
302 result = malloc(stringlen + 1); 302 result = malloc(stringlen + 1);
303 if (!result) 303 if (!result)
304 goto ERROR1; 304 goto ERROR1;
305 for (i = 0; (i < stringlen) && !localstatus; i++) 305 for (i = 0; (i < stringlen) && !localstatus; i++)
306 result[i] = psiconv_read_u8(buf,lev,off+i+len,&localstatus); 306 result[i] = psiconv_read_u8(config,buf,lev,off+i+len,&localstatus);
307 if (localstatus) 307 if (localstatus)
308 goto ERROR2; 308 goto ERROR2;
309 result[stringlen] = 0; 309 result[stringlen] = 0;
310 len += stringlen; 310 len += stringlen;
311 311
312 res_copy = psiconv_make_printable(result); 312 res_copy = psiconv_make_printable(result);
313 if (!res_copy) 313 if (!res_copy)
314 goto ERROR2; 314 goto ERROR2;
315 psiconv_debug(lev+2,off,"Contents: `%s'",res_copy); 315 psiconv_debug(config,lev+2,off,"Contents: `%s'",res_copy);
316 free(res_copy); 316 free(res_copy);
317 317
318 if (length) 318 if (length)
319 *length = len; 319 *length = len;
320 320
321 if (status) 321 if (status)
322 *status = 0; 322 *status = 0;
323 323
324 psiconv_progress(lev+1,off+len-1,"End of string (total length: %08x)",len); 324 psiconv_progress(config,lev+1,off+len-1,"End of string (total length: %08x)",len);
325 325
326 return result; 326 return result;
327 327
328ERROR2: 328ERROR2:
329 free(result); 329 free(result);
330ERROR1: 330ERROR1:
331 psiconv_warn(lev+1,off,"Reading of string failed"); 331 psiconv_warn(config,lev+1,off,"Reading of string failed");
332 if (status) 332 if (status)
333 *status = localstatus; 333 *status = localstatus;
334 if (length) 334 if (length)
335 *length = 0; 335 *length = 0;
336 return NULL; 336 return NULL;
337} 337}
338 338
339psiconv_string_t psiconv_read_short_string(const psiconv_buffer buf, 339psiconv_string_t psiconv_read_short_string(const psiconv_config config, const psiconv_buffer buf,
340 int lev, 340 int lev,
341 psiconv_u32 off,int *length, int *status) 341 psiconv_u32 off,int *length, int *status)
342{ 342{
343 int stringlen,i,len,localstatus; 343 int stringlen,i,len,localstatus;
344 psiconv_string_t result; 344 psiconv_string_t result;
345 char *res_copy; 345 char *res_copy;
346 346
347 psiconv_progress(lev+1,off,"Going to read a short string"); 347 psiconv_progress(config,lev+1,off,"Going to read a short string");
348 348
349 stringlen = psiconv_read_u8(buf,lev+2,off,&localstatus); 349 stringlen = psiconv_read_u8(config,buf,lev+2,off,&localstatus);
350 if (localstatus) 350 if (localstatus)
351 goto ERROR1; 351 goto ERROR1;
352 psiconv_debug(lev+2,off,"Length: %i",stringlen); 352 psiconv_debug(config,lev+2,off,"Length: %i",stringlen);
353 len = 1; 353 len = 1;
354 354
355 result = malloc(stringlen + 1); 355 result = malloc(stringlen + 1);
356 if (!result) 356 if (!result)
357 goto ERROR1; 357 goto ERROR1;
358 for (i = 0; (i < stringlen) && !localstatus; i++) 358 for (i = 0; (i < stringlen) && !localstatus; i++)
359 result[i] = psiconv_read_u8(buf,lev,off+i+len,&localstatus); 359 result[i] = psiconv_read_u8(config,buf,lev,off+i+len,&localstatus);
360 if (localstatus) 360 if (localstatus)
361 goto ERROR2; 361 goto ERROR2;
362 result[stringlen] = 0; 362 result[stringlen] = 0;
363 len += stringlen; 363 len += stringlen;
364 364
365 res_copy = psiconv_make_printable(result); 365 res_copy = psiconv_make_printable(result);
366 if (!res_copy) 366 if (!res_copy)
367 goto ERROR2; 367 goto ERROR2;
368 psiconv_debug(lev+2,off,"Contents: `%s'",res_copy); 368 psiconv_debug(config,lev+2,off,"Contents: `%s'",res_copy);
369 free(res_copy); 369 free(res_copy);
370 370
371 if (length) 371 if (length)
372 *length = len; 372 *length = len;
373 373
374 if (status) 374 if (status)
375 *status = 0; 375 *status = 0;
376 376
377 psiconv_progress(lev+1,off+len-1,"End of short string (total length: %08x)", 377 psiconv_progress(config,lev+1,off+len-1,"End of short string (total length: %08x)",
378 len); 378 len);
379 379
380 return result; 380 return result;
381 381
382 382
383ERROR2: 383ERROR2:
384 free(result); 384 free(result);
385ERROR1: 385ERROR1:
386 psiconv_warn(lev+1,off,"Reading of short string failed"); 386 psiconv_warn(config,lev+1,off,"Reading of short string failed");
387 if (status) 387 if (status)
388 *status = localstatus; 388 *status = localstatus;
389 if (length) 389 if (length)
390 *length = 0; 390 *length = 0;
391 return NULL; 391 return NULL;
392} 392}
393 393
394psiconv_float_t psiconv_read_float(const psiconv_buffer buf, int lev, 394psiconv_float_t psiconv_read_float(const psiconv_config config,const psiconv_buffer buf, int lev,
395 psiconv_u32 off, int *length, int *status) 395 psiconv_u32 off, int *length, int *status)
396{ 396{
397 psiconv_float_t result,bitvalue; 397 psiconv_float_t result,bitvalue;
398 int res,bit; 398 int res,bit;
399 psiconv_u32 temp=0; 399 psiconv_u32 temp=0;
400 400
401 psiconv_progress(lev+1,off,"Going to read a float"); 401 psiconv_progress(config,lev+1,off,"Going to read a float");
402 402
403 bitvalue = 0.5; 403 bitvalue = 0.5;
404 result = 1.0; 404 result = 1.0;
405 for (bit = 0x33; bit > 0; bit--) { 405 for (bit = 0x33; bit > 0; bit--) {
406 if ((bit == 0x33) || ((bit & 0x07) == 0x07)) 406 if ((bit == 0x33) || ((bit & 0x07) == 0x07))
407 temp = psiconv_read_u8(buf,lev+2,off+ (bit >> 3),&res); 407 temp = psiconv_read_u8(config,buf,lev+2,off+ (bit >> 3),&res);
408 if (res) 408 if (res)
409 goto ERROR; 409 goto ERROR;
410 if (temp & (0x01 << (bit & 0x07))) 410 if (temp & (0x01 << (bit & 0x07)))
411 result += bitvalue; 411 result += bitvalue;
412 bitvalue /= 2.0; 412 bitvalue /= 2.0;
413 } 413 }
414 temp = psiconv_read_u16(buf,lev+2,off+6,&res); 414 temp = psiconv_read_u16(config,buf,lev+2,off+6,&res);
415 if (res) 415 if (res)
416 goto ERROR; 416 goto ERROR;
417 if (temp & 0x8000) 417 if (temp & 0x8000)
418 result = -result; 418 result = -result;
419 temp = (temp & 0x7ff0) >> 4; 419 temp = (temp & 0x7ff0) >> 4;
420 result *= pow2(((int) temp)-0x3ff); 420 result *= pow2(((int) temp)-0x3ff);
421 psiconv_debug(lev+1,off,"Float value: %f",result); 421 psiconv_debug(config,lev+1,off,"Float value: %f",result);
422 if (length) 422 if (length)
423 *length = 8; 423 *length = 8;
424 if (*status) 424 if (*status)
425 *status = res; 425 *status = res;
426 return result; 426 return result;
427ERROR: 427ERROR:
428 psiconv_warn(lev+1,off,"Reading of float failed"); 428 psiconv_warn(config,lev+1,off,"Reading of float failed");
429 if (length) 429 if (length)
430 *length = 0; 430 *length = 0;
431 if (*status) 431 if (*status)
432 *status = res; 432 *status = res;
433 return 0.0; 433 return 0.0;

Legend:
Removed from v.167  
changed lines
  Added in v.168

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26