diff --git a/jni/NativeFormats/fbreader/src/formats/fb2/FB2BookReader.cpp b/jni/NativeFormats/fbreader/src/formats/fb2/FB2BookReader.cpp index ac610ffc6..76af983cc 100644 --- a/jni/NativeFormats/fbreader/src/formats/fb2/FB2BookReader.cpp +++ b/jni/NativeFormats/fbreader/src/formats/fb2/FB2BookReader.cpp @@ -212,8 +212,8 @@ void FB2BookReader::startElementHandler(int tag, const char **xmlattributes) { ref = attributeValue(xmlattributes, myBrokenHrefPredicate); } const char *vOffset = attributeValue(xmlattributes, "voffset"); - char offset = (vOffset != 0) ? atoi(vOffset) : 0; - if ((ref != 0) && (*ref == '#')) { + char offset = vOffset != 0 ? std::atoi(vOffset) : 0; + if (ref != 0 && *ref == '#') { ++ref; const bool isCoverImage = myParagraphsBeforeBodyNumber == diff --git a/jni/NativeFormats/fbreader/src/formats/fb2/FB2Reader.cpp b/jni/NativeFormats/fbreader/src/formats/fb2/FB2Reader.cpp index 3f993ba13..4a10d9612 100644 --- a/jni/NativeFormats/fbreader/src/formats/fb2/FB2Reader.cpp +++ b/jni/NativeFormats/fbreader/src/formats/fb2/FB2Reader.cpp @@ -81,7 +81,7 @@ static const FB2Reader::Tag TAGS[] = { int FB2Reader::tag(const char *name) { for (int i = 0; ; ++i) { - if ((TAGS[i].tagName == 0) || (strcmp(name, TAGS[i].tagName) == 0)) { + if (TAGS[i].tagName == 0 || std::strcmp(name, TAGS[i].tagName) == 0) { return TAGS[i].tagCode; } }