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