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

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

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

Revision 71 Revision 72
21#include "compat.h" 21#include "compat.h"
22 22
23#include "generate_routines.h" 23#include "generate_routines.h"
24#include "error.h" 24#include "error.h"
25 25
26int psiconv_write_u8(psiconv_buffer buf,psiconv_u8 value) 26int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value)
27{ 27{
28 return psiconv_list_add(buf,&value); 28 return psiconv_list_add(buf,&value);
29} 29}
30 30
31int psiconv_write_u16(psiconv_buffer buf,psiconv_u16 value) 31int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value)
32{ 32{
33 int res; 33 int res;
34 psiconv_u8 temp; 34 psiconv_u8 temp;
35 temp = value & 0xff; 35 temp = value & 0xff;
36 if ((res = psiconv_list_add(buf,&temp))) 36 if ((res = psiconv_list_add(buf,&temp)))
37 return res; 37 return res;
38 temp = (value & 0xff0) >> 8; 38 temp = (value & 0xff0) >> 8;
39 return psiconv_list_add(buf,&temp); 39 return psiconv_list_add(buf,&temp);
40} 40}
41 41
42int psiconv_write_u32(psiconv_buffer buf,psiconv_u32 value) 42int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value)
43{ 43{
44 int res; 44 int res;
45 psiconv_u8 temp; 45 psiconv_u8 temp;
46 temp = value & 0xff; 46 temp = value & 0xff;
47 if ((res = psiconv_list_add(buf,&temp))) 47 if ((res = psiconv_list_add(buf,&temp)))
54 return res; 54 return res;
55 temp = (value & 0xff000000) >>24; 55 temp = (value & 0xff000000) >>24;
56 return psiconv_list_add(buf,&temp); 56 return psiconv_list_add(buf,&temp);
57} 57}
58 58
59int psiconv_write_S(psiconv_buffer buf, psiconv_u32 value) 59int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value)
60{ 60{
61 if (value < 0x40) 61 if (value < 0x40)
62 return psiconv_write_u8(buf,value * 4 + 2); 62 return psiconv_write_u8(buf,value * 4 + 2);
63 else if (value < 0x2000) 63 else if (value < 0x2000)
64 return psiconv_write_u16(buf,value * 8 + 3); 64 return psiconv_write_u16(buf,value * 8 + 3);
68 "(trying %x)",value); 68 "(trying %x)",value);
69 return -PSICONV_E_GENERATE; 69 return -PSICONV_E_GENERATE;
70 } 70 }
71} 71}
72 72
73int psiconv_write_X(psiconv_buffer buf, psiconv_u32 value) 73int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value)
74{ 74{
75 if (value < 0x80) 75 if (value < 0x80)
76 return psiconv_write_u8(buf,value * 2); 76 return psiconv_write_u8(buf,value * 2);
77 else if (value < 0x4000) 77 else if (value < 0x4000)
78 return psiconv_write_u16(buf,value * 4 + 1); 78 return psiconv_write_u16(buf,value * 4 + 1);
84 "(trying %x)",value); 84 "(trying %x)",value);
85 return -PSICONV_E_GENERATE; 85 return -PSICONV_E_GENERATE;
86 } 86 }
87} 87}
88 88
89int psiconv_write_length(psiconv_buffer buf, psiconv_length_t value) 89int psiconv_write_length(psiconv_buffer buf, const psiconv_length_t value)
90{ 90{
91 return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5); 91 return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5);
92} 92}
93 93
94int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value) 94int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value)
95{ 95{
96 return psiconv_write_u32(buf,value * 20.0 + 0.5); 96 return psiconv_write_u32(buf,value * 20.0 + 0.5);
97} 97}
98 98
99int psiconv_write_bool(psiconv_buffer buf, psiconv_bool_t value) 99int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value)
100{ 100{
101 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
102 psiconv_warn(0,psiconv_list_length(buf),
103 "Boolean has non-enum value (found %d)",value);
101 return psiconv_write_u8(buf,value == psiconv_bool_true?1:0); 104 return psiconv_write_u8(buf,value == psiconv_bool_false?0:1);
102} 105}
103 106
104int psiconv_write_string(psiconv_buffer buf, psiconv_string_t value) 107int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value)
105{ 108{
106 int res,i; 109 int res,i;
110 if (!value) {
111 psiconv_warn(0,psiconv_list_length(buf),
112 "NULL string");
113 return -PSICONV_E_GENERATE;
114 }
107 if ((res = psiconv_write_S(buf,strlen(value)))) 115 if ((res = psiconv_write_S(buf,strlen(value))))
108 return res; 116 return res;
109 for (i = 0; i < strlen(value); i++) 117 for (i = 0; i < strlen(value); i++)
110 if ((res = psiconv_write_u8(buf,value[i]))) 118 if ((res = psiconv_write_u8(buf,value[i])))
111 return res; 119 return res;

Legend:
Removed from v.71  
changed lines
  Added in v.72

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