Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 93f4bef4f383cb04e923199cbaaa969607de0910..5308961411950ba36df47474b3705c6b3158f79b 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -27,8 +27,15 @@
 
 #include "macros.h"
 
 
 #include "macros.h"
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+using std::ostream;
+#endif
+

 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);

+char *_strrstrip(char *String); // right strip only

 char *_strtabexpand(char *String,size_t Len);
 bool ParseQuoteWord(const char *&String,std::string &Res);
 bool ParseCWord(const char *&String,std::string &Res);
 char *_strtabexpand(char *String,size_t Len);
 bool ParseQuoteWord(const char *&String,std::string &Res);
 bool ParseCWord(const char *&String,std::string &Res);


@@ -101,6 +108,10 @@ inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterat
 APT_MKSTRCMP2(stringcmp,stringcmp);
 APT_MKSTRCMP2(stringcasecmp,stringcasecmp);
 
 APT_MKSTRCMP2(stringcmp,stringcmp);
 APT_MKSTRCMP2(stringcasecmp,stringcasecmp);
 

+// Return the length of a NULL-terminated string array
+size_t strv_length(const char **str_array);
+
+

 inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
 
 class URI
 inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
 
 class URI