/[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 142 Revision 182
… …
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include <string.h>
21
20#include "config.h" 22#include "config.h"
21#include "compat.h" 23#include "compat.h"
22 24
23#include "generate_routines.h" 25#include "generate_routines.h"
24#include "error.h" 26#include "error.h"
25 27
26#ifdef DMALLOC 28#ifdef DMALLOC
27#include <dmalloc.h> 29#include <dmalloc.h>
28#endif 30#endif
29 31
32static int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value,int kind);
30 33
31int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value) 34int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,const psiconv_u8 value)
32{ 35{
33 return psiconv_buffer_add(buf,value); 36 return psiconv_buffer_add(buf,value);
34} 37}
35 38
36int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value) 39int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,const psiconv_u16 value)
37{ 40{
38 int res; 41 int res;
39 if ((res = psiconv_buffer_add(buf,value & 0xff))) 42 if ((res = psiconv_buffer_add(buf,value & 0xff)))
40 return res; 43 return res;
41 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 44 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
42} 45}
43 46
44int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value) 47int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,const psiconv_u32 value)
45{ 48{
46 int res; 49 int res;
47 if ((res = psiconv_buffer_add(buf,value & 0xff))) 50 if ((res = psiconv_buffer_add(buf,value & 0xff)))
48 return res; 51 return res;
49 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 52 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
… …
51 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 54 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
52 return res; 55 return res;
53 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 56 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
54} 57}
55 58
56int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value) 59int psiconv_write_S(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
57{ 60{
58 if (value < 0x40) 61 if (value < 0x40)
59 return psiconv_write_u8(buf,value * 4 + 2); 62 return psiconv_write_u8(config,buf,value * 4 + 2);
60 else if (value < 0x2000) 63 else if (value < 0x2000)
61 return psiconv_write_u16(buf,value * 8 + 3); 64 return psiconv_write_u16(config,buf,value * 8 + 3);
62 else { 65 else {
63 psiconv_warn(0,psiconv_buffer_length(buf), 66 psiconv_warn(config,0,psiconv_buffer_length(buf),
64 "Don't know how to write S value larger than 0x2000 " 67 "Don't know how to write S value larger than 0x2000 "
65 "(trying %x)",value); 68 "(trying %x)",value);
66 return -PSICONV_E_GENERATE; 69 return -PSICONV_E_GENERATE;
67 } 70 }
68} 71}
69 72
70int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value) 73int psiconv_write_X(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
71{ 74{
72 if (value < 0x80) 75 if (value < 0x80)
73 return psiconv_write_u8(buf,value * 2); 76 return psiconv_write_u8(config,buf,value * 2);
74 else if (value < 0x4000) 77 else if (value < 0x4000)
75 return psiconv_write_u16(buf,value * 4 + 1); 78 return psiconv_write_u16(config,buf,value * 4 + 1);
76 else if (value < 0x20000000) 79 else if (value < 0x20000000)
77 return psiconv_write_u16(buf,value * 8 + 3); 80 return psiconv_write_u16(config,buf,value * 8 + 3);
78 else { 81 else {
79 psiconv_warn(0,psiconv_buffer_length(buf), 82 psiconv_warn(config,0,psiconv_buffer_length(buf),
80 "Don't know how to write X value larger than 0x20000000 " 83 "Don't know how to write X value larger than 0x20000000 "
81 "(trying %x)",value); 84 "(trying %x)",value);
82 return -PSICONV_E_GENERATE; 85 return -PSICONV_E_GENERATE;
83 } 86 }
84} 87}
85 88
86int psiconv_write_length(psiconv_buffer buf, const psiconv_length_t value) 89int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, const psiconv_length_t value)
87{ 90{
88 return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5); 91 return psiconv_write_u32(config,buf,value * (1440.0/2.54) + 0.5);
89} 92}
90 93
91int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value) 94int psiconv_write_size(const psiconv_config config,psiconv_buffer buf, psiconv_size_t value)
92{ 95{
93 return psiconv_write_u32(buf,value * 20.0 + 0.5); 96 return psiconv_write_u32(config,buf,value * 20.0 + 0.5);
94} 97}
95 98
96int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value) 99int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, const psiconv_bool_t value)
97{ 100{
98 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 101 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
99 psiconv_warn(0,psiconv_buffer_length(buf), 102 psiconv_warn(config,0,psiconv_buffer_length(buf),
100 "Boolean has non-enum value (found %d)",value); 103 "Boolean has non-enum value (found %d)",value);
101 return psiconv_write_u8(buf,value == psiconv_bool_false?0:1); 104 return psiconv_write_u8(config,buf,value == psiconv_bool_false?0:1);
102} 105}
103 106
104int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value) 107int psiconv_write_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value)
108{
109 return psiconv_write_string_aux(config,buf,value,0);
110}
111
112int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value)
113{
114 return psiconv_write_string_aux(config,buf,value,1);
115}
116
117int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value,int kind)
105{ 118{
106 int res,i; 119 int res,i;
107 if (!value) { 120 if (!value) {
108 psiconv_warn(0,psiconv_buffer_length(buf), 121 psiconv_warn(config,0,psiconv_buffer_length(buf),
109 "NULL string"); 122 "NULL string");
110 return -PSICONV_E_GENERATE; 123 return -PSICONV_E_GENERATE;
111 } 124 }
125 if (kind == 0)
112 if ((res = psiconv_write_S(buf,strlen(value)))) 126 res = psiconv_write_S(config,buf,strlen(value));
127 else
128 res = psiconv_write_u8(config,buf,strlen(value));
129 if (res)
113 return res; 130 return res;
114 for (i = 0; i < strlen(value); i++) 131 for (i = 0; i < strlen(value); i++)
115 if ((res = psiconv_write_u8(buf,value[i]))) 132 if ((res = psiconv_write_u8(config,buf,value[i])))
116 return res; 133 return res;
117 return -PSICONV_E_OK; 134 return -PSICONV_E_OK;
118} 135}
119 136
120int psiconv_write_offset(psiconv_buffer buf, psiconv_u32 id) 137int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, psiconv_u32 id)
121{ 138{
122 return psiconv_buffer_add_reference(buf,id); 139 return psiconv_buffer_add_reference(buf,id);
123} 140}
Legend:
Removed from v.142  
changed lines
  Added in v.182
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26