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