goo/GooString.cc | 12 ++++++------ goo/GooString.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 8dc1e98b8e112ed48155920f5aa4e46b5d616e79 Author: Albert Astals Cid <aa...@kde.org> Date: Sun Sep 23 02:14:51 2018 +0200 GooString: some more const diff --git a/goo/GooString.cc b/goo/GooString.cc index 0cf32a3a..7a75ef45 100644 --- a/goo/GooString.cc +++ b/goo/GooString.cc @@ -230,7 +230,7 @@ GooString::GooString(GooString *str1, GooString *str2) { GooString *GooString::fromInt(int x) { char buf[24]; // enough space for 64-bit ints plus a little extra - char *p; + const char *p; int len; formatInt(x, buf, sizeof(buf), gFalse, 0, 10, &p, &len); return new GooString(p, len); @@ -301,7 +301,7 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) { char buf[65]; int len, i; const char *p0, *p1; - char *str; + const char *str; GooStringFormatArg argsBuf[ 8 ]; argsLen = 0; @@ -624,7 +624,7 @@ static const char upperCaseDigits[17] = "0123456789ABCDEF"; void GooString::formatInt(long long x, char *buf, int bufSize, GBool zeroFill, int width, int base, - char **p, int *len, GBool upperCase) { + const char **p, int *len, GBool upperCase) { const char *vals = upperCase ? upperCaseDigits : lowerCaseDigits; GBool neg; int start, i, j; @@ -659,7 +659,7 @@ void GooString::formatInt(long long x, char *buf, int bufSize, void GooString::formatUInt(unsigned long long x, char *buf, int bufSize, GBool zeroFill, int width, int base, - char **p, int *len, GBool upperCase) { + const char **p, int *len, GBool upperCase) { const char *vals = upperCase ? upperCaseDigits : lowerCaseDigits; int i, j; @@ -682,7 +682,7 @@ void GooString::formatUInt(unsigned long long x, char *buf, int bufSize, } void GooString::formatDouble(double x, char *buf, int bufSize, int prec, - GBool trim, char **p, int *len) { + GBool trim, const char **p, int *len) { GBool neg, started; double x2; int d, i, j; @@ -721,7 +721,7 @@ void GooString::formatDouble(double x, char *buf, int bufSize, int prec, } void GooString::formatDoubleSmallAware(double x, char *buf, int bufSize, int prec, - GBool trim, char **p, int *len) + GBool trim, const char **p, int *len) { double absX = fabs(x); if (absX >= 0.1) { diff --git a/goo/GooString.h b/goo/GooString.h index 78ebd85b..142fb684 100644 --- a/goo/GooString.h +++ b/goo/GooString.h @@ -195,14 +195,14 @@ private: void resize(int newLength); static void formatInt(long long x, char *buf, int bufSize, GBool zeroFill, int width, int base, - char **p, int *len, GBool upperCase = gFalse); + const char **p, int *len, GBool upperCase = gFalse); static void formatUInt(unsigned long long x, char *buf, int bufSize, GBool zeroFill, int width, int base, - char **p, int *len, GBool upperCase = gFalse); + const char **p, int *len, GBool upperCase = gFalse); static void formatDouble(double x, char *buf, int bufSize, int prec, - GBool trim, char **p, int *len); + GBool trim, const char **p, int *len); static void formatDoubleSmallAware(double x, char *buf, int bufSize, int prec, - GBool trim, char **p, int *len); + GBool trim, const char **p, int *len); }; #endif _______________________________________________ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler