summaryrefslogtreecommitdiff
path: root/fofi
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2018-09-23 00:42:51 +0200
committerAlbert Astals Cid <aacid@kde.org>2018-09-23 00:42:51 +0200
commitda87b12ef125e3c2d43822004f1f9f2a7f45aaf3 (patch)
treefbce4850f3e844e537553656fe1067ba900a8a7d /fofi
parent1b48d72ad9b5e73334d330b94917a351c5305e61 (diff)
FoFiBase: Add some const
Diffstat (limited to 'fofi')
-rw-r--r--fofi/FoFiBase.cc20
-rw-r--r--fofi/FoFiBase.h18
2 files changed, 19 insertions, 19 deletions
diff --git a/fofi/FoFiBase.cc b/fofi/FoFiBase.cc
index 2fa71d13..6d7697c2 100644
--- a/fofi/FoFiBase.cc
+++ b/fofi/FoFiBase.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2008 Ed Avis <eda@waniasset.com>
// Copyright (C) 2011 Jim Meyering <jim@meyering.net>
-// Copyright (C) 2016 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2016, 2018 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -86,7 +86,7 @@ char *FoFiBase::readFile(char *fileName, int *fileLen) {
return buf;
}
-int FoFiBase::getS8(int pos, GBool *ok) {
+int FoFiBase::getS8(int pos, GBool *ok) const {
int x;
if (pos < 0 || pos >= len) {
@@ -100,7 +100,7 @@ int FoFiBase::getS8(int pos, GBool *ok) {
return x;
}
-int FoFiBase::getU8(int pos, GBool *ok) {
+int FoFiBase::getU8(int pos, GBool *ok) const {
if (pos < 0 || pos >= len) {
*ok = gFalse;
return 0;
@@ -108,7 +108,7 @@ int FoFiBase::getU8(int pos, GBool *ok) {
return file[pos];
}
-int FoFiBase::getS16BE(int pos, GBool *ok) {
+int FoFiBase::getS16BE(int pos, GBool *ok) const {
int x;
if (pos < 0 || pos+1 >= len || pos > INT_MAX - 1) {
@@ -123,7 +123,7 @@ int FoFiBase::getS16BE(int pos, GBool *ok) {
return x;
}
-int FoFiBase::getU16BE(int pos, GBool *ok) {
+int FoFiBase::getU16BE(int pos, GBool *ok) const {
int x;
if (pos < 0 || pos+1 >= len || pos > INT_MAX - 1) {
@@ -135,7 +135,7 @@ int FoFiBase::getU16BE(int pos, GBool *ok) {
return x;
}
-int FoFiBase::getS32BE(int pos, GBool *ok) {
+int FoFiBase::getS32BE(int pos, GBool *ok) const {
int x;
if (pos < 0 || pos+3 >= len || pos > INT_MAX - 3) {
@@ -152,7 +152,7 @@ int FoFiBase::getS32BE(int pos, GBool *ok) {
return x;
}
-Guint FoFiBase::getU32BE(int pos, GBool *ok) {
+Guint FoFiBase::getU32BE(int pos, GBool *ok) const {
Guint x;
if (pos < 0 || pos+3 >= len || pos > INT_MAX - 3) {
@@ -166,7 +166,7 @@ Guint FoFiBase::getU32BE(int pos, GBool *ok) {
return x;
}
-Guint FoFiBase::getU32LE(int pos, GBool *ok) {
+Guint FoFiBase::getU32LE(int pos, GBool *ok) const {
Guint x;
if (pos < 0 || pos+3 >= len || pos > INT_MAX - 3) {
@@ -180,7 +180,7 @@ Guint FoFiBase::getU32LE(int pos, GBool *ok) {
return x;
}
-Guint FoFiBase::getUVarBE(int pos, int size, GBool *ok) {
+Guint FoFiBase::getUVarBE(int pos, int size, GBool *ok) const {
Guint x;
int i;
@@ -195,7 +195,7 @@ Guint FoFiBase::getUVarBE(int pos, int size, GBool *ok) {
return x;
}
-GBool FoFiBase::checkRegion(int pos, int size) {
+GBool FoFiBase::checkRegion(int pos, int size) const {
return pos >= 0 &&
pos < INT_MAX - size &&
size < INT_MAX - pos &&
diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h
index be4e7025..d7e77b0f 100644
--- a/fofi/FoFiBase.h
+++ b/fofi/FoFiBase.h
@@ -52,16 +52,16 @@ protected:
// S = signed / U = unsigned
// 8/16/32/Var = word length, in bytes
// BE = big endian
- int getS8(int pos, GBool *ok);
- int getU8(int pos, GBool *ok);
- int getS16BE(int pos, GBool *ok);
- int getU16BE(int pos, GBool *ok);
- int getS32BE(int pos, GBool *ok);
- Guint getU32BE(int pos, GBool *ok);
- Guint getU32LE(int pos, GBool *ok);
- Guint getUVarBE(int pos, int size, GBool *ok);
+ int getS8(int pos, GBool *ok) const;
+ int getU8(int pos, GBool *ok) const;
+ int getS16BE(int pos, GBool *ok) const;
+ int getU16BE(int pos, GBool *ok) const;
+ int getS32BE(int pos, GBool *ok) const;
+ Guint getU32BE(int pos, GBool *ok) const;
+ Guint getU32LE(int pos, GBool *ok) const;
+ Guint getUVarBE(int pos, int size, GBool *ok) const;
- GBool checkRegion(int pos, int size);
+ GBool checkRegion(int pos, int size) const;
Guchar *fileData;
Guchar *file;