test framework: Correctly generate new paths in noopchroot

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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 5731b5a2b157b4d316b698e7bcbee8132f9ca252..396cb7898c0e5dc26f31bbbbe030aa4c7cb90ca9 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -331,7 +331,7 @@ string QuoteString(const string &Str, const char *Bad)
          *I == 0x25 || // percent '%' char
          *I <= 0x20 || *I >= 0x7F) // control chars
       {
          *I == 0x25 || // percent '%' char
          *I <= 0x20 || *I >= 0x7F) // control chars
       {

-        ioprintf(Res,"%%%02x",(int)*I);
+        ioprintf(Res, "%%%02hhx", *I);

       }
       else
         Res << *I;
       }
       else
         Res << *I;


@@ -1308,7 +1308,7 @@ void ioprintf(ostream &out,const char *format,...)
    va_list args;
    ssize_t size = 400;
    while (true) {
    va_list args;
    ssize_t size = 400;
    while (true) {

-      bool ret = false;
+      bool ret;

       va_start(args,format);
       ret = iovprintf(out, format, args, size);
       va_end(args);
       va_start(args,format);
       ret = iovprintf(out, format, args, size);
       va_end(args);


@@ -1322,7 +1322,7 @@ void strprintf(string &out,const char *format,...)
    ssize_t size = 400;
    std::ostringstream outstr;
    while (true) {
    ssize_t size = 400;
    std::ostringstream outstr;
    while (true) {

-      bool ret = false;
+      bool ret;

       va_start(args,format);
       ret = iovprintf(outstr, format, args, size);
       va_end(args);
       va_start(args,format);
       ret = iovprintf(outstr, format, args, size);
       va_end(args);