← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apt-cacher-ng/saucy

« back to all changes in this revision

Viewing changes to source/meta.cc

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2011-08-07 17:53:21 UTC
  • mfrom: (24.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110807175321-k80jrotzovldgu3c
* New upstream version
  + fixes various regressions
* removed dependency on libfuse2 (now used via dlopen, moved to Suggests)
* support new build-* targets in rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/meta.cc
105
105
/*!
106
106
 * \brief Simple split function, outputs resulting tokens into a string vector, with or without purging the previous contents
107
107
 */
108
 
tStrVec::size_type Tokenize(const string & in, const char *sep, tStrVec & out, bool bAppend, MYSTD::string::size_type nStartOffset)
 
108
tStrVec::size_type Tokenize(const string & in, const char *sep,
 
109
                tStrVec & out, bool bAppend, MYSTD::string::size_type nStartOffset)
109
110
{
110
111
        if(!bAppend)
111
112
                out.clear();
124
125
                pos=pos2+1;
125
126
        }
126
127
        tok_done:
127
 
        return out.size()-nBefore;
 
128
        return (out.size()-nBefore);
128
129
}
129
130
 
130
131
 
365
366
                if(from[i] != '%')
366
367
                        to+=from[i];
367
368
                else if(i>from.length()-3 // cannot start another sequence here (too short), keep as-is
368
 
                                || hexmap[(unsigned char) from[i+1]]<0 // not hex?
369
 
                                || hexmap[(unsigned char) from[i+2]]<0)
 
369
                                || hexmap[(UCHAR)from[i+1]]>15 // not hex?
 
370
                                || hexmap[(UCHAR)from[i+2]]>15)
370
371
                {
371
372
                        ret=false;
372
373
                }