1 mike 1.1 ? erp.diff
2 Index: wsmanbuffer.c
3 ===================================================================
4 RCS file: /cvsroot/omi/protocol/wsmanbuffer.c,v
5 retrieving revision 1.7
6 diff -r1.7 wsmanbuffer.c
7 25a26
8 > #include <stdarg.h>
9 410c411
10 < MI_INLINE MI_Boolean _Field_GetExists(
11 ---
12 > INLINE MI_Boolean _Field_GetExists(
13 616a618,651
14 > #if defined(CONFIG_FAVORSIZE)
15 > MI_Result WSBuf_AddLits(
16 > WS_Buffer* buf,
17 > ...)
18 > {
19 > va_list ap;
20 >
21 > va_start(ap, buf);
22 mike 1.1 >
23 > for (;;)
24 > {
25 > const char* str;
26 > size_t len;
27 > MI_Result r;
28 >
29 > str = va_arg(ap, const char*);
30 >
31 > if (!str)
32 > break;
33 >
34 > len = va_arg(ap, size_t);
35 >
36 > r = WSBuf_AddLit(buf, str, len);
37 >
38 > if (r != MI_RESULT_OK)
39 > return r;
40 > }
41 >
42 > va_end(ap);
43 mike 1.1 >
44 > return MI_RESULT_OK;
45 > }
46 > #endif /* defined(CONFIG_FAVORSIZE) */
47 >
48 749a785,795
49 > #if defined(CONFIG_FAVORSIZE)
50 >
51 > return WSBuf_AddLits(
52 > buf,
53 > LIT("<p:"),
54 > name, Zlen(name),
55 > LIT(">"),
56 > NULL);
57 >
58 > #else
59 >
60 759a806,807
61 >
62 > #endif
63 765a814,824
64 mike 1.1 > #if defined(CONFIG_FAVORSIZE)
65 >
66 > return WSBuf_AddLits(
67 > buf,
68 > LIT("</p:"),
69 > name, Zlen(name),
70 > LIT(">\n"),
71 > NULL);
72 >
73 > #else
74 >
75 775a835,836
76 >
77 > #endif
78 793a855,874
79 > #if defined(CONFIG_FAVORSIZE)
80 >
81 > if (start)
82 > {
83 > return WSBuf_AddLits(
84 > buf,
85 mike 1.1 > LIT(MI_T("<wsman:Selector Name=\"")),
86 > name, Zlen(name),
87 > "\">",
88 > NULL);
89 > }
90 > else
91 > {
92 > return WSBuf_AddLit(
93 > buf,
94 > LIT(MI_T("</wsman:Selector>") XML_CR));
95 > }
96 >
97 > #else
98 >
99 796c877,878
100 < if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("<wsman:Selector Name=\""))) ||
101 ---
102 > if ( MI_RESULT_OK != WSBuf_AddLit(buf,
103 > LIT(MI_T("<wsman:Selector Name=\""))) ||
104 798,799c880,881
105 < MI_RESULT_OK != WSBuf_AddLit2(buf, '"', '>')
106 mike 1.1 < )
107 ---
108 > MI_RESULT_OK != WSBuf_AddLit2(buf, '"', '>'))
109 > {
110 800a883
111 > }
112 804,805c887,889
113 < if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("</wsman:Selector>") XML_CR))
114 < )
115 ---
116 > if (MI_RESULT_OK != WSBuf_AddLit(buf,
117 > LIT(MI_T("</wsman:Selector>") XML_CR)))
118 > {
119 806a891
120 > }
121 809a895,896
122 >
123 > #endif
124 816c903,913
125 < if ( MI_RESULT_OK != WSBuf_AddLit3(buf, '<', 'p', ':') ||
126 ---
127 mike 1.1 > #if defined(CONFIG_FAVORSIZE)
128 >
129 > return WSBuf_AddLits(
130 > buf,
131 > LIT("<p:"),
132 > name, Zlen(name),
133 > LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR));
134 >
135 > #else
136 >
137 > if (MI_RESULT_OK != WSBuf_AddLit3(buf, '<', 'p', ':') ||
138 818c915,917
139 < MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR)) )
140 ---
141 > MI_RESULT_OK != WSBuf_AddLit(buf,
142 > LIT(MI_T(" xsi:nil=\"true\"/>") XML_CR)))
143 > {
144 819a919
145 > }
146 821a922,923
147 >
148 mike 1.1 > #endif
149 858,859c960
150 < if (WSBuf_AddLit3(buf, '<', 'p', ':') != MI_RESULT_OK)
151 < return MI_RESULT_FAILED;
152 ---
153 > #if defined(CONFIG_FAVORSIZE)
154 861,862c962,970
155 < if (WSBuf_AddStringNoEncoding(buf, name) != MI_RESULT_OK)
156 < return MI_RESULT_FAILED;
157 ---
158 > if (WSBuf_AddLits(
159 > buf,
160 > LIT("<p:"),
161 > name, Zlen(name),
162 > LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">")),
163 > NULL) != MI_RESULT_OK)
164 > {
165 > return -1;
166 > }
167 864,865c972,977
168 < if (WSBuf_AddLit(buf,
169 mike 1.1 < LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">"))) != MI_RESULT_OK)
170 ---
171 > #else
172 >
173 > if (WSBuf_AddLit3(buf, '<', 'p', ':') != MI_RESULT_OK ||
174 > WSBuf_AddStringNoEncoding(buf, name) != MI_RESULT_OK ||
175 > WSBuf_AddLit(buf,
176 > LIT(MI_T(" xsi:type=\"cim:cimBase64Binary\">"))) != MI_RESULT_OK)
177 869a982,983
178 > #endif
179 >
180 1202a1317,1336
181 > #if defined(CONFIG_FAVORSIZE)
182 >
183 > if (WSBuf_AddLits(
184 > buf,
185 > LIT("<wsa:Address>"),
186 > LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"),
187 > LIT("</wsa:Address>" XML_CR),
188 > LIT("<wsa:ReferenceParameters>" XML_CR),
189 > LIT("<wsman:ResourceURI>"),
190 mike 1.1 > LIT("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"),
191 > cd->name, Zlen(cd->name),
192 > LIT("</wsman:ResourceURI>" XML_CR),
193 > LIT("<wsman:SelectorSet>" XML_CR),
194 > NULL) != MI_RESULT_OK)
195 > {
196 > return MI_RESULT_FAILED;
197 > }
198 >
199 > #else
200 >
201 1211a1346,1347
202 > #endif
203 >
204 1241,1242c1377,1381
205 < if ( MI_RESULT_OK != WSBuf_AddLit(buf,LIT(MI_T("</wsman:SelectorSet>") XML_CR
206 < MI_T("</wsa:ReferenceParameters>") XML_CR )) )
207 ---
208 > if (WSBuf_AddLit(
209 > buf,
210 > LIT("</wsman:SelectorSet>" XML_CR
211 mike 1.1 > "</wsa:ReferenceParameters>" XML_CR)) != MI_RESULT_OK)
212 > {
213 1243a1383
214 > }
215 1279a1420
216 > size_t nameLen = Zlen(cd->name);
217 1294a1436,1472
218 > #if defined(CONFIG_FAVORSIZE)
219 >
220 > if (WSBuf_AddLits(
221 > buf,
222 > LIT("<p:"),
223 > cd->name, nameLen,
224 > LIT(" xmlns:p=\""),
225 > LIT("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"),
226 > cd->name, nameLen,
227 > LIT("\"\n"),
228 > NULL) != MI_RESULT_OK)
229 > {
230 > return MI_RESULT_FAILED;
231 > }
232 mike 1.1 >
233 > if (embedded)
234 > {
235 > if (WSBuf_AddLits(
236 > buf,
237 > LIT(" xsi:type=\""),
238 > cd->name, nameLen,
239 > LIT("_Type\"" XML_CR),
240 > NULL) != MI_RESULT_OK)
241 > {
242 > return MI_RESULT_FAILED;
243 > }
244 > }
245 >
246 > if (WSBuf_AddLits(
247 > buf,
248 > LIT(">\n"),
249 > NULL) != MI_RESULT_OK)
250 > {
251 > return MI_RESULT_FAILED;
252 > }
253 mike 1.1 >
254 > #else
255 1309a1488
256 >
257 1312a1492,1493
258 > #endif
259 >
260 1344a1526,1539
261 > #if defined(CONFIG_FAVORSIZE)
262 >
263 > if (WSBuf_AddLits(
264 > buf,
265 > LIT("</p:"),
266 > cd->name, nameLen,
267 > LIT(">\n"),
268 > NULL) != MI_RESULT_OK)
269 > {
270 > return MI_RESULT_OK;
271 > }
272 >
273 > #else
274 mike 1.1 >
275 1349a1545,1546
276 >
277 > #endif
278 1479a1677,1741
279 > /* Generate new uniqueue msg id */
280 > WSBuf_GenerateMessageID(msgID);
281 >
282 > #if defined(CONFIG_FAVORSIZE)
283 >
284 > if (WSBuf_AddLits(
285 > buf,
286 > LIT("<SOAP-ENV:Envelope "),
287 > /* SOAP-ENV */
288 > LIT("xmlns:SOAP-ENV=\""),
289 > LIT("http://www.w3.org/2003/05/soap-envelope"),
290 > LIT("\" "),
291 > /* wsa */
292 > LIT("xmlns:wsa=\""),
293 > LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing"),
294 > LIT("\" "),
295 mike 1.1 > /* wsen */
296 > LIT("xmlns:wsen=\""),
297 > LIT("http://schemas.xmlsoap.org/ws/2004/09/enumeration"),
298 > LIT("\" "),
299 > /* xsi */
300 > LIT("xmlns:xsi=\""),
301 > LIT("http://www.w3.org/2001/XMLSchema-instance"),
302 > LIT("\" "),
303 > /* wsmb */
304 > LIT("xmlns:wsmb=\""),
305 > LIT("http://schemas.dmtf.org/wbem/wsman/1/cimbinding.xsd"),
306 > LIT("\" "),
307 > /* wsman */
308 > LIT("xmlns:wsman=\""),
309 > LIT("http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"),
310 > LIT("\" "),
311 > /* wsf */
312 > LIT("xmlns:wxf=\""),
313 > LIT("http://schemas.xmlsoap.org/ws/2004/09/transfer"),
314 > LIT("\" "),
315 > /* xml */
316 mike 1.1 > LIT("xmlns:xml=\""),
317 > LIT("http://www.w3.org/XML/1998/namespace"),
318 > LIT("\" "),
319 > /* wsmid */
320 > LIT("xmlns:wsmid=\""),
321 > LIT("http://schemas.dmtf.org/wbem/wsman/identity/1/wsmanidentity.xsd"),
322 > LIT("\" >" XML_CR),
323 > /* close */
324 > LIT("<SOAP-ENV:Header>" XML_CR),
325 > /* wsa:To */
326 > LIT("<wsa:To>"),
327 > LIT("http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"),
328 > LIT("</wsa:To>" XML_CR),
329 > /* Action */
330 > LIT("<wsa:Action>"),
331 > action, actionSize,
332 > LIT("</wsa:Action>" XML_CR),
333 > /* MessageID */
334 > LIT("<wsa:MessageID>"),
335 > msgID, WS_MSG_ID_SIZE - 1,
336 > LIT("</wsa:MessageID>" XML_CR),
337 mike 1.1 > NULL))
338 > {
339 > goto failed;
340 > }
341 >
342 > #else
343 >
344 1509,1511d1770
345 < /* Generate new uniqueue msg id */
346 < WSBuf_GenerateMessageID(msgID);
347 <
348 1518a1778,1779
349 > #endif
350 >
351 1520a1782,1795
352 > #if defined(CONFIG_FAVORSIZE)
353 >
354 > if (WSBuf_AddLits(
355 > buf,
356 > LIT("<wsa:RelatesTo>"),
357 > relatesTo, Zlen(relatesTo),
358 mike 1.1 > LIT("</wsa:RelatesTo>" XML_CR),
359 > NULL) != MI_RESULT_OK)
360 > {
361 > goto failed;
362 > }
363 >
364 > #else
365 >
366 1530a1806,1807
367 >
368 > #endif
369 1570a1848,1861
370 > #if defined(CONFIG_FAVORSIZE)
371 >
372 > if (WSBuf_AddLits(
373 > &outBuf,
374 > LIT("<SOAP-ENV:NotUnderstood qname=\""),
375 > notUnderstoodTag, Zlen(notUnderstoodTag),
376 > LIT("\"/>"),
377 > NULL) != MI_RESULT_OK)
378 > {
379 mike 1.1 > goto failed;
380 > }
381 >
382 > #else
383 >
384 1579a1871,1872
385 >
386 > #endif
387 1600a1894,1909
388 > #if defined(CONFIG_FAVORSIZE)
389 >
390 > if (WSBuf_AddLits(
391 > &outBuf,
392 > LIT("<SOAP-ENV:Subcode>" XML_CR),
393 > LIT("<SOAP-ENV:Value>"),
394 > fault->subCode, Zlen(fault->subCode),
395 > LIT("</SOAP-ENV:Value>" XML_CR),
396 > LIT("</SOAP-ENV:Subcode>" XML_CR),
397 > NULL) != MI_RESULT_OK)
398 > {
399 > goto failed;
400 mike 1.1 > }
401 >
402 > #else
403 >
404 1612a1922
405 > #endif
406 Index: wsmanbuffer.h
407 ===================================================================
408 RCS file: /cvsroot/omi/protocol/wsmanbuffer.h,v
409 retrieving revision 1.1
410 diff -r1.1 wsmanbuffer.h
411 102a103,107
412 > /* Append string literals to the buffer. The last argument must be NULL */
413 > MI_Result WSBuf_AddLits(
414 > WS_Buffer* buf,
415 > ...);
416 >
|
Return to
AddLits.diff
CVS log
Up to [OMI] / omi / doc