Variable scope reduction.

diff --git a/projects/sgconf_xml/main.cpp b/projects/sgconf_xml/main.cpp
index 8c2ce593f9afbe0fccf10f066093359a8ae9a340..d43efea4ec1adff6f7efa22ea152fb3815a338a1 100644 (file)
--- a/projects/sgconf_xml/main.cpp
+++ b/projects/sgconf_xml/main.cpp
@@ -24,6 +24,10 @@ $Author: nobunaga $
 $Date: 2008/01/05 12:11:34 $
 */
 
 $Date: 2008/01/05 12:11:34 $
 */
 

+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "request.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>


@@ -33,10 +37,6 @@ $Date: 2008/01/05 12:11:34 $
 #include <arpa/inet.h>
 #include <string.h>
 
 #include <arpa/inet.h>
 #include <string.h>
 

-#include "stg/common.h"
-#include "stg/netunit.h"
-#include "request.h"
-

 #define FN_LEN          (512)
 #define REQ_STR_LEN     (300)
 char fileName[FN_LEN];
 #define FN_LEN          (512)
 #define REQ_STR_LEN     (300)
 char fileName[FN_LEN];

diff --git a/projects/sgconf_xml/parser.cpp b/projects/sgconf_xml/parser.cpp
index f2d5993bb9bf2fa86eaf21178e8056c539248a9c..23ec776aab86ab666b69eb1ecb4c7a6a768f53f7 100644 (file)
--- a/projects/sgconf_xml/parser.cpp
+++ b/projects/sgconf_xml/parser.cpp
@@ -1,12 +1,12 @@
+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "request.h"
+

 #include <stdlib.h>
 #include <stdio.h>
 #include <expat.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <expat.h>
 #include <string.h>
 

-#include "stg/common.h"
-#include "stg/netunit.h"
-#include "request.h"
-

 int parse_depth = 0;
 XML_Parser parser;
 //---------------------------------------------------------------------------
 int parse_depth = 0;
 XML_Parser parser;
 //---------------------------------------------------------------------------


@@ -92,16 +92,14 @@ if (strncasecmp(el, "dir_name_", 9) == 0 || strcasecmp(el, "address") == 0 || st
 
 if (strcasecmp(el, "traff") == 0)
     {
 
 if (strcasecmp(el, "traff") == 0)
     {

-//      printf ("<traff>\n");

     int j = 0;
     int j = 0;

-    uint64_t t;

     while (attr[j])
         {
     while (attr[j])
         {

+        uint64_t t;

         str2x(attr[j+1], t);
         printf ("<%s>%lld</%s>\n", attr[j], t, attr[j]);
         j+=2;
         }
         str2x(attr[j+1], t);
         printf ("<%s>%lld</%s>\n", attr[j], t, attr[j]);
         j+=2;
         }

-//      printf ("</traff>\n");

     return;
     }
 else
     return;
     }
 else


@@ -109,7 +107,6 @@ else
     printf ("<%s>%s</%s>\n", el, attr[1], el);
     return;
     }
     printf ("<%s>%s</%s>\n", el, attr[1], el);
     return;
     }

-//    }

 parse_depth++;
 if (parse_depth == 1)
     {
 parse_depth++;
 if (parse_depth == 1)
     {


@@ -130,17 +127,17 @@ if (parse_depth == 1)
 void EndElement(void *, const char *el)
 {
 parse_depth--;
 void EndElement(void *, const char *el)
 {
 parse_depth--;

-if (strcasecmp(el, "ServerInfo") == 0 || strcasecmp(el, "Tariffs") == 0 || strcasecmp(el, "Admins") == 0 || strcasecmp(el, "Users") == 0 || strcasecmp(el, "tariff") == 0 || strcasecmp(el, "user") == 0)
-    {
+if (strcasecmp(el, "ServerInfo") == 0 ||
+    strcasecmp(el, "Tariffs") == 0 ||
+    strcasecmp(el, "Admins") == 0 ||
+    strcasecmp(el, "Users") == 0 ||
+    strcasecmp(el, "tariff") == 0 ||
+    strcasecmp(el, "user") == 0)

     printf ("</%s>\n", el);
     printf ("</%s>\n", el);

-    }

 }
 //---------------------------------------------------------------------------
 int ParseReply(void *, list<string> * ans)
 }
 //---------------------------------------------------------------------------
 int ParseReply(void *, list<string> * ans)

-//int ParseReply(void * data, SLIST * ans)

 {
 {

-//char answ[ENC_MSG_LEN + 1];
-int len;

 int done = 0;
 
 parse_depth = 0;
 int done = 0;
 
 parse_depth = 0;


@@ -158,7 +155,7 @@ XML_SetElementHandler(parser, StartElement, EndElement);
 list<string>::iterator n = ans->begin();
 while (n != ans->end())
     {
 list<string>::iterator n = ans->begin();
 while (n != ans->end())
     {

-    len = strlen(n->c_str());
+    int len = strlen(n->c_str());

 
     if (++n == ans->end())
         done = 1;
 
     if (++n == ans->end())
         done = 1;