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