]>
Commit | Line | Data |
---|---|---|
bf2b8930 PZ |
1 | diff -ur seed-2.30.0/libseed/seed-closure.c seed-2.30.0.new/libseed/seed-closure.c |
2 | --- seed-2.30.0/libseed/seed-closure.c 2010-03-29 05:24:27.000000000 +0200 | |
3 | +++ seed-2.30.0.new/libseed/seed-closure.c 2010-07-22 20:32:46.310173356 +0200 | |
4 | @@ -97,30 +97,12 @@ | |
5 | case GI_TYPE_TAG_UINT32: | |
6 | arg->v_uint32 = *(guint32 *) args[i]; | |
7 | break; | |
8 | - case GI_TYPE_TAG_LONG: | |
9 | - arg->v_long = *(glong *) args[i]; | |
10 | - break; | |
11 | case GI_TYPE_TAG_INT64: | |
12 | arg->v_int64 = *(gint64 *) args[i]; | |
13 | break; | |
14 | - case GI_TYPE_TAG_ULONG: | |
15 | - arg->v_ulong = *(gulong *) args[i]; | |
16 | - break; | |
17 | case GI_TYPE_TAG_UINT64: | |
18 | arg->v_uint64 = *(guint64 *) args[i]; | |
19 | break; | |
20 | - case GI_TYPE_TAG_INT: | |
21 | - arg->v_int = *(gint *) args[i]; | |
22 | - break; | |
23 | - case GI_TYPE_TAG_SSIZE: | |
24 | - arg->v_ssize = *(gssize *) args[i]; | |
25 | - break; | |
26 | - case GI_TYPE_TAG_SIZE: | |
27 | - arg->v_size = *(gsize *) args[i]; | |
28 | - break; | |
29 | - case GI_TYPE_TAG_UINT: | |
30 | - arg->v_uint = *(guint *) args[i]; | |
31 | - break; | |
32 | case GI_TYPE_TAG_FLOAT: | |
33 | arg->v_float = *(gfloat *) args[i]; | |
34 | break; | |
35 | @@ -215,30 +197,12 @@ | |
36 | case GI_TYPE_TAG_UINT32: | |
37 | *(guint32 *) result = return_arg.v_uint32; | |
38 | break; | |
39 | - case GI_TYPE_TAG_LONG: | |
40 | - *(glong *) result = return_arg.v_long; | |
41 | - break; | |
42 | case GI_TYPE_TAG_INT64: | |
43 | *(gint64 *) result = return_arg.v_int64; | |
44 | break; | |
45 | - case GI_TYPE_TAG_ULONG: | |
46 | - *(gulong *) result = return_arg.v_ulong; | |
47 | - break; | |
48 | case GI_TYPE_TAG_UINT64: | |
49 | *(guint64 *) result = return_arg.v_uint64; | |
50 | break; | |
51 | - case GI_TYPE_TAG_INT: | |
52 | - *(gint *) result = return_arg.v_int; | |
53 | - break; | |
54 | - case GI_TYPE_TAG_SSIZE: | |
55 | - *(gssize *) result = return_arg.v_ssize; | |
56 | - break; | |
57 | - case GI_TYPE_TAG_SIZE: | |
58 | - *(gsize *) result = return_arg.v_size; | |
59 | - break; | |
60 | - case GI_TYPE_TAG_UINT: | |
61 | - *(guint *) result = return_arg.v_uint; | |
62 | - break; | |
63 | case GI_TYPE_TAG_FLOAT: | |
64 | *(gfloat *) result = return_arg.v_float; | |
65 | break; | |
66 | diff -ur seed-2.30.0/libseed/seed-types.c seed-2.30.0.new/libseed/seed-types.c | |
67 | --- seed-2.30.0/libseed/seed-types.c 2010-03-29 05:24:27.000000000 +0200 | |
68 | +++ seed-2.30.0.new/libseed/seed-types.c 2010-07-22 20:35:25.450269459 +0200 | |
69 | @@ -366,23 +366,6 @@ | |
70 | *array_p = dblresult; | |
71 | } | |
72 | break; | |
73 | - case GI_TYPE_TAG_INT: | |
74 | - { | |
75 | - gint *intresult; | |
76 | - | |
77 | - intresult = g_new0 (gint, length + 1); | |
78 | - | |
79 | - for (i = 0; i < length; i++) | |
80 | - { | |
81 | - elem = JSObjectGetPropertyAtIndex (ctx, | |
82 | - (JSObjectRef) array, | |
83 | - i, exception); | |
84 | - intresult[i] = seed_value_to_int (ctx, elem, exception); | |
85 | - } | |
86 | - | |
87 | - *array_p = intresult; | |
88 | - } | |
89 | - break; | |
90 | case GI_TYPE_TAG_UINT8: | |
91 | { | |
92 | guint8 *guint8result; | |
93 | @@ -492,30 +475,12 @@ | |
94 | case GI_TYPE_TAG_UINT32: | |
95 | arg->v_uint32 = seed_value_to_uint (ctx, value, exception); | |
96 | break; | |
97 | - case GI_TYPE_TAG_LONG: | |
98 | - arg->v_long = seed_value_to_long (ctx, value, exception); | |
99 | - break; | |
100 | case GI_TYPE_TAG_INT64: | |
101 | arg->v_int64 = seed_value_to_int64 (ctx, value, exception); | |
102 | break; | |
103 | - case GI_TYPE_TAG_ULONG: | |
104 | - arg->v_ulong = seed_value_to_ulong (ctx, value, exception); | |
105 | - break; | |
106 | case GI_TYPE_TAG_UINT64: | |
107 | arg->v_uint64 = seed_value_to_uint64 (ctx, value, exception); | |
108 | break; | |
109 | - case GI_TYPE_TAG_INT: | |
110 | - arg->v_int = seed_value_to_int (ctx, value, exception); | |
111 | - break; | |
112 | - case GI_TYPE_TAG_UINT: | |
113 | - arg->v_uint = seed_value_to_uint (ctx, value, exception); | |
114 | - break; | |
115 | - case GI_TYPE_TAG_SIZE: | |
116 | - arg->v_size = seed_value_to_size (ctx, value, exception); | |
117 | - break; | |
118 | - case GI_TYPE_TAG_SSIZE: | |
119 | - arg->v_ssize = seed_value_to_ssize (ctx, value, exception); | |
120 | - break; | |
121 | case GI_TYPE_TAG_FLOAT: | |
122 | arg->v_float = seed_value_to_float (ctx, value, exception); | |
123 | break; | |
124 | @@ -531,9 +496,6 @@ | |
125 | case GI_TYPE_TAG_GTYPE: | |
126 | arg->v_int = seed_value_to_int (ctx, value, exception); | |
127 | break; | |
128 | - case GI_TYPE_TAG_TIME_T: | |
129 | - arg->v_long = seed_value_to_time_t (ctx, value, exception); | |
130 | - break; | |
131 | case GI_TYPE_TAG_INTERFACE: | |
132 | { | |
133 | GIBaseInfo *interface; | |
134 | @@ -774,22 +736,10 @@ | |
135 | return seed_value_from_int (ctx, arg->v_int32, exception); | |
136 | case GI_TYPE_TAG_UINT32: | |
137 | return seed_value_from_uint (ctx, arg->v_uint32, exception); | |
138 | - case GI_TYPE_TAG_LONG: | |
139 | - return seed_value_from_long (ctx, arg->v_long, exception); | |
140 | case GI_TYPE_TAG_INT64: | |
141 | return seed_value_from_int64 (ctx, arg->v_int64, exception); | |
142 | - case GI_TYPE_TAG_ULONG: | |
143 | - return seed_value_from_ulong (ctx, arg->v_ulong, exception); | |
144 | case GI_TYPE_TAG_UINT64: | |
145 | return seed_value_from_uint64 (ctx, arg->v_uint64, exception); | |
146 | - case GI_TYPE_TAG_INT: | |
147 | - return seed_value_from_int (ctx, arg->v_int32, exception); | |
148 | - case GI_TYPE_TAG_UINT: | |
149 | - return seed_value_from_uint (ctx, arg->v_uint32, exception); | |
150 | - case GI_TYPE_TAG_SSIZE: | |
151 | - return seed_value_from_ssize (ctx, arg->v_ssize, exception); | |
152 | - case GI_TYPE_TAG_SIZE: | |
153 | - return seed_value_from_size (ctx, arg->v_size, exception); | |
154 | case GI_TYPE_TAG_FLOAT: | |
155 | return seed_value_from_float (ctx, arg->v_float, exception); | |
156 | case GI_TYPE_TAG_DOUBLE: | |
157 | @@ -800,8 +750,6 @@ | |
158 | return seed_value_from_filename (ctx, arg->v_string, exception); | |
159 | case GI_TYPE_TAG_GTYPE: | |
160 | return seed_value_from_int (ctx, arg->v_int, exception); | |
161 | - case GI_TYPE_TAG_TIME_T: | |
162 | - return seed_value_from_time_t (ctx, arg->v_long, exception); | |
163 | case GI_TYPE_TAG_ARRAY: | |
164 | { | |
165 | GITypeInfo *param_type; | |
166 | @@ -933,8 +881,6 @@ | |
167 | return seed_value_from_char (ctx, g_value_get_char (gval), exception); | |
168 | case G_TYPE_UCHAR: | |
169 | return seed_value_from_uchar (ctx, g_value_get_uchar (gval), exception); | |
170 | - case G_TYPE_INT: | |
171 | - return seed_value_from_int (ctx, g_value_get_int (gval), exception); | |
172 | case G_TYPE_UINT: | |
173 | return seed_value_from_uint (ctx, g_value_get_uint (gval), exception); | |
174 | case G_TYPE_LONG: | |
175 | @@ -1111,16 +1057,6 @@ | |
176 | val, exception)); | |
177 | return TRUE; | |
178 | } | |
179 | - case G_TYPE_INT: | |
180 | - case G_TYPE_UINT: | |
181 | - { | |
182 | - g_value_init (ret, type); | |
183 | - if (type == G_TYPE_INT) | |
184 | - g_value_set_int (ret, seed_value_to_int (ctx, val, exception)); | |
185 | - else | |
186 | - g_value_set_uint (ret, seed_value_to_uint (ctx, val, exception)); | |
187 | - return TRUE; | |
188 | - } | |
189 | case G_TYPE_CHAR: | |
190 | { | |
191 | g_value_init (ret, G_TYPE_CHAR); | |
192 | @@ -1133,8 +1069,6 @@ | |
193 | g_value_set_uchar (ret, seed_value_to_uchar (ctx, val, exception)); | |
194 | return TRUE; | |
195 | } | |
196 | - case G_TYPE_LONG: | |
197 | - case G_TYPE_ULONG: | |
198 | case G_TYPE_INT64: | |
199 | case G_TYPE_UINT64: | |
200 | case G_TYPE_FLOAT: |