- NO FUNCTIONAL CODE CHANGES!!!!

- changed code formating from tabs to spaces and others
- used astyle with this option:
  --style=ansi --indent=spaces=2 -M --pad-oper --unpad-paren --pad-header --align-pointer=name --lineend=linux
This commit is contained in:
Andreas Volz 2011-11-28 12:44:11 +01:00
parent b100e9d32a
commit 1c8e43e6d6
76 changed files with 5691 additions and 5492 deletions

View file

@ -40,9 +40,9 @@ using namespace DBus;
void usage(const char *argv0)
{
cerr << endl << "Usage: " << argv0 << " <xmlfile> [ --proxy=<outfile.h> ] [ --adaptor=<outfile.h> ]"
<< endl << endl;
exit(-1);
cerr << endl << "Usage: " << argv0 << " <xmlfile> [ --proxy=<outfile.h> ] [ --adaptor=<outfile.h> ]"
<< endl << endl;
exit(-1);
}
/*int char_to_atomic_type(char t)
@ -61,68 +61,67 @@ void usage(const char *argv0)
}*/
int main(int argc, char ** argv)
int main(int argc, char **argv)
{
if (argc < 2)
{
usage(argv[0]);
}
if (argc < 2)
{
usage(argv[0]);
}
bool proxy_mode, adaptor_mode;
char *proxy, *adaptor;
bool proxy_mode, adaptor_mode;
char *proxy, *adaptor;
proxy_mode = false;
proxy = 0;
proxy_mode = false;
proxy = 0;
adaptor_mode = false;
adaptor = 0;
for (int a = 1; a < argc; ++a)
{
if (!strncmp(argv[a], "--proxy=", 8))
{
proxy_mode = true;
proxy = argv[a] +8;
}
else
if (!strncmp(argv[a], "--adaptor=", 10))
{
adaptor_mode = true;
adaptor = argv[a] +10;
}
}
adaptor_mode = false;
adaptor = 0;
if (!proxy_mode && !adaptor_mode) usage(argv[0]);
for (int a = 1; a < argc; ++a)
{
if (!strncmp(argv[a], "--proxy=", 8))
{
proxy_mode = true;
proxy = argv[a] + 8;
}
else if (!strncmp(argv[a], "--adaptor=", 10))
{
adaptor_mode = true;
adaptor = argv[a] + 10;
}
}
ifstream xmlfile(argv[1]);
if (!proxy_mode && !adaptor_mode) usage(argv[0]);
if (xmlfile.bad())
{
cerr << "unable to open file " << argv[1] << endl;
return -1;
}
ifstream xmlfile(argv[1]);
Xml::Document doc;
if (xmlfile.bad())
{
cerr << "unable to open file " << argv[1] << endl;
return -1;
}
try
{
xmlfile >> doc;
//cout << doc.to_xml();
}
catch(Xml::Error &e)
{
cerr << "error parsing " << argv[1] << ": " << e.what() << endl;
return -1;
}
Xml::Document doc;
if (!doc.root)
{
cerr << "empty document" << endl;
return -1;
}
try
{
xmlfile >> doc;
//cout << doc.to_xml();
}
catch (Xml::Error &e)
{
cerr << "error parsing " << argv[1] << ": " << e.what() << endl;
return -1;
}
if (proxy_mode) generate_proxy(doc, proxy);
if (adaptor_mode) generate_adaptor(doc, adaptor);
if (!doc.root)
{
cerr << "empty document" << endl;
return -1;
}
return 0;
if (proxy_mode) generate_proxy(doc, proxy);
if (adaptor_mode) generate_adaptor(doc, adaptor);
return 0;
}