Ticket 37. The braces removed in the case construction in the

[stg.git] / stglibs / common.lib / common.cpp

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index dab99605a71fe6a16d6c83db60a88f86825f4101..8b62e68b0fad70adfd55e8c4c445c1b352c0b43a 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -47,6 +47,8 @@
 
 #include <iconv.h>
 
 
 #include <iconv.h>
 

+#include <algorithm>
+

 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>


@@ -274,10 +276,9 @@ return str;
 //---------------------------------------------------------------------------
 void KOIToWin(const char * s1, char * s2, int l)
 {
 //---------------------------------------------------------------------------
 void KOIToWin(const char * s1, char * s2, int l)
 {

-unsigned char t;

 for (int j = 0; j < l; j++)
     {
 for (int j = 0; j < l; j++)
     {

-    t = s1[j];
+    unsigned char t = s1[j];

     s2[j] = koi2win[t];
 
     if (s1[j] == 0)
     s2[j] = koi2win[t];
 
     if (s1[j] == 0)


@@ -287,10 +288,9 @@ for (int j = 0; j < l; j++)
 //---------------------------------------------------------------------------
 void WinToKOI(const char * s1, char * s2, int l)
 {
 //---------------------------------------------------------------------------
 void WinToKOI(const char * s1, char * s2, int l)
 {

-unsigned char t;

 for (int j = 0; j < l; j++)
     {
 for (int j = 0; j < l; j++)
     {

-    t = s1[j];
+    unsigned char t = s1[j];

     s2[j] = win2koi[t];
 
     if (s1[j] == 0)
     s2[j] = win2koi[t];
 
     if (s1[j] == 0)


@@ -301,11 +301,10 @@ for (int j = 0; j < l; j++)
 void KOIToWin(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());
 void KOIToWin(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());

-unsigned char t;

 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {
 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {

-    t = s1[j];
+    unsigned char t = s1[j];

     s2->push_back(koi2win[t]);
     }
 }
     s2->push_back(koi2win[t]);
     }
 }


@@ -313,11 +312,10 @@ for (int j = 0; j < (int)s1.length(); j++)
 void WinToKOI(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());
 void WinToKOI(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());

-unsigned char t;

 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {
 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {

-    t = s1[j];
+    unsigned char t = s1[j];

     s2->push_back(win2koi[t]);
     }
 }
     s2->push_back(win2koi[t]);
     }
 }


@@ -400,11 +398,10 @@ int ParseIPString(const char * str, uint32_t * ips, int maxIP)
  */
 
 char p[255];
  */
 
 char p[255];

-char * p1, *pp;

 int n = 0;
 
 strncpy(p, str, 254);
 int n = 0;
 
 strncpy(p, str, 254);

-pp = p;
+char * pp = p;

 
 memset(ips, 0xFF, sizeof(unsigned long) * maxIP);
 
 
 memset(ips, 0xFF, sizeof(unsigned long) * maxIP);
 


@@ -416,7 +413,7 @@ if (str[0] == '*' && strlen(str) == 1)
 
 for (int i = 0; i < maxIP; i++)
     {
 
 for (int i = 0; i < maxIP; i++)
     {

-    p1 = strtok(pp, ",\n ");
+    char * p1 = strtok(pp, ",\n ");

     pp = NULL;
 
     if (p1 == NULL && n == 0)// ÕËÁÚÁÔÅÌØ ÎÕÌØ É ÐÒÏÞÉÔÁÎÏ ÁÄÒÅÓÏ× ÔÏÖÅ ÎÏÌØ
     pp = NULL;
 
     if (p1 == NULL && n == 0)// ÕËÁÚÁÔÅÌØ ÎÕÌØ É ÐÒÏÞÉÔÁÎÏ ÁÄÒÅÓÏ× ÔÏÖÅ ÎÏÌØ


@@ -663,20 +660,18 @@ strcpy(str, stren);
 //---------------------------------------------------------------------------
 void DecodeStr(char * str, unsigned long serial, int useHDD)
 {
 //---------------------------------------------------------------------------
 void DecodeStr(char * str, unsigned long serial, int useHDD)
 {

-int len = strlen(str);
+size_t len = strlen(str);

 char strdc[100];
 char strdc[100];

-int i, j = 0;
-char c1, c2;

 char serial_c[sizeof(serial)];
 memcpy(serial_c, &serial, sizeof(serial));
 
 char serial_c[sizeof(serial)];
 memcpy(serial_c, &serial, sizeof(serial));
 

-for (i = 0; i < len; i += 2)
+for (size_t i = 0; i < len; i += 2)

     {
     {

-    c1 = (str[i] - 50);
-    c2 = (str[i+1] - 50)<<4;
+    char c1 = (str[i] - 50);
+    char c2 = (str[i+1] - 50)<<4;

     strdc[i/2] = c1+c2;
     }
     strdc[i/2] = c1+c2;
     }

-for (i = 0; i < len/2; i++)
+for (size_t i = 0; i < len/2; i++)

     {
     if (!useHDD)
         strdc[i] = strdc[i]^49;
     {
     if (!useHDD)
         strdc[i] = strdc[i]^49;


@@ -757,6 +752,11 @@ if (errno == ERANGE)
 
 return 0;
 }
 
 return 0;
 }

+//---------------------------------------------------------------------------
+int str2x(const std::string & str, double & x)
+{
+return strtodouble2(str.c_str(), x);
+}

 #ifndef WIN32
 //---------------------------------------------------------------------------
 int str2x(const std::string & str, int64_t & x)
 #ifndef WIN32
 //---------------------------------------------------------------------------
 int str2x(const std::string & str, int64_t & x)


@@ -793,7 +793,8 @@ return unsigned2str(x, s);
 const std::string & x2str(double x, std::string & s)
 {
 char buf[256];
 const std::string & x2str(double x, std::string & s)
 {
 char buf[256];

-s = snprintf(buf, sizeof(buf), "%f", x);
+snprintf(buf, sizeof(buf), "%f", x);
+s = buf;

 return s;
 }
 //---------------------------------------------------------------------------
 return s;
 }
 //---------------------------------------------------------------------------


@@ -826,6 +827,18 @@ std::string & Trim(std::string & val)
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------

+std::string ToLower(std::string value)
+{
+    std::transform(value.begin(), value.end(), value.begin(), ::tolower);
+    return value;
+}
+//---------------------------------------------------------------------------
+std::string ToUpper(std::string value)
+{
+    std::transform(value.begin(), value.end(), value.begin(), ::toupper);
+    return value;
+}
+//---------------------------------------------------------------------------

 #ifdef WIN32
 static int is_leap(unsigned y)
 {
 #ifdef WIN32
 static int is_leap(unsigned y)
 {


@@ -891,7 +904,7 @@ strncpy(inBuf, source.c_str(), source.length());
 
 inBuf[source.length()] = 0;
 
 
 inBuf[source.length()] = 0;
 

-#if defined(FREE_BSD) || defined(FREE_BSD5) || defined(WIN32)
+#if defined(CONST_ICONV)

 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;
 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;


@@ -1021,3 +1034,48 @@ if (res == 0) // Timeout
 
 return true;
 }
 
 return true;
 }

+
+bool ReadAll(int sd, void * dest, size_t size)
+{
+size_t done = 0;
+char * ptr = static_cast<char *>(dest);
+while (done < size)
+    {
+    if (!WaitPackets(sd))
+        return false;
+    ssize_t res = read(sd, ptr + done, size - done);
+    if (res < 0)
+        return false;
+    if (res == 0)
+        return true;
+    done += res;
+    }
+return true;
+}
+
+bool WriteAll(int sd, const void * source, size_t size)
+{
+size_t done = 0;
+const char * ptr = static_cast<const char *>(source);
+while (done < size)
+    {
+    ssize_t res = write(sd, ptr + done, size - done);
+    if (res <= 0)
+        return false;
+    done += res;
+    }
+return true;
+}
+
+std::string ToPrintable(const std::string & src)
+{
+    std::string dest;
+
+    for (size_t i = 0; i < src.size(); ++i)
+        if (std::isprint(src[i]))
+            dest += src[i];
+        else
+            dest += "\\" + x2str(src[i]);
+
+    return dest;
+}