Fix accessing array element above array bounds in rsconf

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

diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index 6e9576983b5b95544a6f3ca2e40b9e18d5e39ca5..ac0911472778ea25e543acd883341a4f2437b7e7 100644 (file)
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -34,8 +34,8 @@
 #endif
 #include <string>
 
 #endif
 #include <string>
 

-#include "os_int.h"
-#include "stg_const.h"
+#include "stg/os_int.h"
+#include "stg/const.h"

 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)
 
 #define STAT_TIME_3         (1)
 #define STAT_TIME_2         (2)


@@ -98,6 +98,15 @@ std::string &   Trim(std::string & val);
 
 std::string     IconvString(const std::string & source, const std::string & from, const std::string & to);
 
 
 std::string     IconvString(const std::string & source, const std::string & from, const std::string & to);
 

+int ParseInt(const std::string & str, int * val);
+int ParseUnsigned(const std::string & str, unsigned * val);
+int ParseIntInRange(const std::string & str, int min, int max, int * val);
+int ParseUnsignedInRange(const std::string & str, unsigned min,
+                         unsigned max, unsigned * val);
+int ParseYesNo(const std::string & str, bool * val);
+
+bool WaitPackets(int sd);
+

 //-----------------------------------------------------------------------------
 template <typename varT>
 int str2x(const std::string & str, varT & x)
 //-----------------------------------------------------------------------------
 template <typename varT>
 int str2x(const std::string & str, varT & x)


@@ -221,8 +230,10 @@ int str2x(const std::string & str, int & x);
 int str2x(const std::string & str, unsigned & x);
 int str2x(const std::string & str, long & x);
 int str2x(const std::string & str, unsigned long & x);
 int str2x(const std::string & str, unsigned & x);
 int str2x(const std::string & str, long & x);
 int str2x(const std::string & str, unsigned long & x);

+#ifndef WIN32

 int str2x(const std::string & str, long long & x);
 int str2x(const std::string & str, unsigned long long & x);
 int str2x(const std::string & str, long long & x);
 int str2x(const std::string & str, unsigned long long & x);

+#endif

 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);
 const std::string & x2str(unsigned long x, std::string & s);
 //-----------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s);
 const std::string & x2str(unsigned long x, std::string & s);