Convert most callers of isspace() to isspace_ascii()

This converts all callers that read machine-generated data,
callers that might work with user input are not converted.

3 files changed, 5 insertions, 2 deletions

diff --git a/methods/https.cc b/methods/https.cc
index a99b1861b..ac6d355ed 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -52,7 +52,7 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
    CURLUserPointer *me = static_cast<CURLUserPointer *>(userp);
    std::string line((char*) buffer, len);
    for (--len; len > 0; --len)
-      if (isspace(line[len]) == 0)
+      if (isspace_ascii(line[len]) == 0)
       {
 	 ++len;
 	 break;
diff --git a/methods/rred.cc b/methods/rred.cc
index 351c1ebf9..89d706984 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -7,6 +7,7 @@
 
 #include <config.h>
 
+#include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
@@ -692,6 +693,8 @@ int main(int argc, char **argv)
    bool test = false;
    Patch patch;
 
+   pkgInitConfig(*_config);
+
    if (argc <= 1) {
       RredMethod Mth;
       return Mth.Run();
diff --git a/methods/server.cc b/methods/server.cc
index e89af2dfe..d5188d4a3 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -114,7 +114,7 @@ bool ServerState::HeaderLine(string Line)
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;
-   while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
+   while (Pos2 < Line.length() && isspace_ascii(Line[Pos2]) != 0)
       Pos2++;
 
    string Tag = string(Line,0,Pos);