1612
|
1 |
Index: libwbxml-trunk/tools/getopt.h
|
|
2 |
===================================================================
|
|
3 |
--- libwbxml-trunk/tools/getopt.h (revision 148)
|
|
4 |
+++ libwbxml-trunk/tools/getopt.h (working copy)
|
|
5 |
@@ -5,13 +5,13 @@
|
|
6 |
*
|
|
7 |
* @author Kannel Team (http://www.kannel.org/)
|
|
8 |
*
|
|
9 |
- * @brief getopt() implementation
|
|
10 |
+ * @brief wbxml_getopt() implementation
|
|
11 |
*/
|
|
12 |
|
|
13 |
#ifndef WBXML_GETOPT_H
|
|
14 |
#define WBXML_GETOPT_H
|
|
15 |
|
|
16 |
-int getopt(int argc, char **argv, char *opts);
|
|
17 |
+int wbxml_getopt(int argc, char **argv, char *opts);
|
|
18 |
extern int opterr;
|
|
19 |
extern int optind;
|
|
20 |
extern int optopt;
|
|
21 |
Index: libwbxml-trunk/tools/wbxml2xml_tool.c
|
|
22 |
===================================================================
|
|
23 |
--- libwbxml-trunk/tools/wbxml2xml_tool.c (revision 148)
|
|
24 |
+++ libwbxml-trunk/tools/wbxml2xml_tool.c (working copy)
|
|
25 |
@@ -236,7 +236,7 @@
|
|
26 |
params.indent = 1;
|
|
27 |
params.keep_ignorable_ws = FALSE;
|
|
28 |
|
|
29 |
- while ((opt = (WB_TINY) getopt(argc, argv, "kh?o:m:i:l:")) != EOF)
|
|
30 |
+ while ((opt = (WB_TINY) wbxml_getopt(argc, argv, "kh?o:m:i:l:")) != EOF)
|
|
31 |
{
|
|
32 |
switch (opt) {
|
|
33 |
case 'k':
|
|
34 |
Index: libwbxml-trunk/tools/xml2wbxml_tool.c
|
|
35 |
===================================================================
|
|
36 |
--- libwbxml-trunk/tools/xml2wbxml_tool.c (revision 148)
|
|
37 |
+++ libwbxml-trunk/tools/xml2wbxml_tool.c (working copy)
|
|
38 |
@@ -105,7 +105,7 @@
|
|
39 |
params.use_strtbl = TRUE;
|
|
40 |
params.keep_ignorable_ws = FALSE;
|
|
41 |
|
|
42 |
- while ((opt = (WB_TINY) getopt(argc, argv, "nkh?o:v:")) != EOF)
|
|
43 |
+ while ((opt = (WB_TINY) wbxml_getopt(argc, argv, "nkh?o:v:")) != EOF)
|
|
44 |
{
|
|
45 |
switch (opt) {
|
|
46 |
case 'v':
|
|
47 |
Index: libwbxml-trunk/tools/attgetopt.c
|
|
48 |
===================================================================
|
|
49 |
--- libwbxml-trunk/tools/attgetopt.c (revision 148)
|
|
50 |
+++ libwbxml-trunk/tools/attgetopt.c (working copy)
|
|
51 |
@@ -22,7 +22,7 @@
|
|
52 |
int optopt;
|
|
53 |
char *optarg;
|
|
54 |
|
|
55 |
-int getopt(int argc, char **argv, char *opts)
|
|
56 |
+int wbxml_getopt(int argc, char **argv, char *opts)
|
|
57 |
{
|
|
58 |
static int sp = 1;
|
|
59 |
register int c;
|