suppoer $(ARCH) in deb822 sources.list as well

[apt.git] / apt-pkg / contrib / strutl.h

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index eb47287a42327269a646631f563154c32941a1b6..8d746f10eb348c7580722ffeda4cd03572948424 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -17,7 +17,7 @@
 #define STRUTL_H
 
 
 #define STRUTL_H
 
 

-
+#include <limits>

 #include <stdlib.h>
 #include <string>
 #include <cstring>
 #include <stdlib.h>
 #include <string>
 #include <cstring>


@@ -33,6 +33,14 @@ using std::vector;
 using std::ostream;
 #endif
 
 using std::ostream;
 #endif
 

+namespace APT {
+   namespace String {
+      std::string Strip(const std::string &s);
+      bool Endswith(const std::string &s, const std::string &ending);
+   };
+};
+
+

 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 char *_strrstrip(char *String); // right strip only
 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 char *_strrstrip(char *String); // right strip only


@@ -86,7 +94,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 

-                                     unsigned int maxsplit=0) __attrib_const;
+                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) __attrib_const;

 
 void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
 void strprintf(std::string &out,const char *format,...) __like_printf(2);
 
 void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
 void strprintf(std::string &out,const char *format,...) __like_printf(2);