aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdrian Kummerlaender2017-10-06 14:37:53 +0200
committerAdrian Kummerlaender2017-10-06 14:43:00 +0200
commitd951a22faf35aabe526de2588006c9381904b137 (patch)
tree3d02269647d0d8490f5d105c50c49295d688af72 /src
parent538236772ce6edde390079c32533c1e70cf8bdca (diff)
downloadDictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar.gz
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar.bz2
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar.lz
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar.xz
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.tar.zst
DictzipQuery-d951a22faf35aabe526de2588006c9381904b137.zip
Provide definition reader primitive
Diffstat (limited to 'src')
-rw-r--r--src/istream/buffer.cc12
-rw-r--r--src/util/base64.cc10
2 files changed, 11 insertions, 11 deletions
diff --git a/src/istream/buffer.cc b/src/istream/buffer.cc
index aaa93ff..26697f4 100644
--- a/src/istream/buffer.cc
+++ b/src/istream/buffer.cc
@@ -168,27 +168,27 @@ int IstreamBuf::underflow() {
// From C++ annotations 8.1.0~pre1, chapter 23.
std::streamsize IstreamBuf::xsgetn(char *dest, std::streamsize n) {
int nread = 0;
-
+
while ( n ) {
if ( !this->in_avail() ) {
if ( this->underflow() == EOF ) {
break;
}
}
-
+
int avail = this->in_avail();
-
+
if (avail > n) {
avail = n;
}
-
+
std::memcpy(dest + nread, gptr(), avail);
this->gbump(avail);
-
+
nread += avail;
n -= avail;
}
-
+
return nread;
}
diff --git a/src/util/base64.cc b/src/util/base64.cc
index 4e8d0a4..4a4f095 100644
--- a/src/util/base64.cc
+++ b/src/util/base64.cc
@@ -8,22 +8,22 @@ namespace dictzip {
std::size_t base64_decode(const std::string& encoded) {
std::vector<std::int8_t> map(256,-1);
- for ( int i = 0; i < 64; ++i ) {
+ for ( int i = 0; i < 64; ++i ) {
map["ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[i]] = i;
}
std::size_t value = 0;
- for ( std::uint8_t c : encoded ) {
- if ( map[c] == -1 ) {
+ for ( std::uint8_t c : encoded ) {
+ if ( map[c] == -1 ) {
throw std::invalid_argument("Invalid character in BASE64 string.");
} else {
value *= 64;
value += map[c];
}
- }
+ }
- return value;
+ return value;
}
}