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