Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: core/src/fxcrt/fx_basic_gcc.cpp

Issue 1265503005: clang-format all pdfium code. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: sigh Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/src/fxcrt/fx_basic_gcc.cpp
diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp
index 2497c74a8e07fa798dd8580fdfb119fd28a3fbcd..bf3d61524ec832d824b899bf16310660d702b464 100644
--- a/core/src/fxcrt/fx_basic_gcc.cpp
+++ b/core/src/fxcrt/fx_basic_gcc.cpp
@@ -10,80 +10,72 @@
#include "../../include/fxcrt/fx_string.h"
template <class T, class STR_T>
-T FXSYS_StrToInt(STR_T str)
-{
- FX_BOOL neg = FALSE;
- if (str == NULL) {
- return 0;
- }
- if (*str == '-') {
- neg = TRUE;
- str ++;
- }
- T num = 0;
- while (*str) {
- if ((*str) < '0' || (*str) > '9') {
- break;
- }
- if (num > (std::numeric_limits<T>::max() - 9) / 10) {
- break;
- }
- num = num * 10 + (*str) - '0';
- str ++;
- }
- return neg ? -num : num;
+T FXSYS_StrToInt(STR_T str) {
+ FX_BOOL neg = FALSE;
+ if (str == NULL) {
+ return 0;
+ }
+ if (*str == '-') {
+ neg = TRUE;
+ str++;
+ }
+ T num = 0;
+ while (*str) {
+ if ((*str) < '0' || (*str) > '9') {
+ break;
+ }
+ if (num > (std::numeric_limits<T>::max() - 9) / 10) {
+ break;
+ }
+ num = num * 10 + (*str) - '0';
+ str++;
+ }
+ return neg ? -num : num;
}
template <typename T, typename STR_T>
-STR_T FXSYS_IntToStr(T value, STR_T string, int radix)
-{
- int i = 0;
- if (value < 0) {
- string[i++] = '-';
- value = -value;
- } else if (value == 0) {
- string[0] = '0';
- string[1] = 0;
- return string;
- }
- int digits = 1;
- T order = value / 10;
- while(order > 0) {
- digits++;
- order = order / 10;
- }
- for (int d = digits - 1; d > -1; d--) {
- string[d + i] = "0123456789abcdef"[value % 10];
- value /= 10;
- }
- string[digits + i] = 0;
+STR_T FXSYS_IntToStr(T value, STR_T string, int radix) {
+ int i = 0;
+ if (value < 0) {
+ string[i++] = '-';
+ value = -value;
+ } else if (value == 0) {
+ string[0] = '0';
+ string[1] = 0;
return string;
+ }
+ int digits = 1;
+ T order = value / 10;
+ while (order > 0) {
+ digits++;
+ order = order / 10;
+ }
+ for (int d = digits - 1; d > -1; d--) {
+ string[d + i] = "0123456789abcdef"[value % 10];
+ value /= 10;
+ }
+ string[digits + i] = 0;
+ return string;
}
#ifdef __cplusplus
extern "C" {
#endif
-int32_t FXSYS_atoi(const FX_CHAR* str)
-{
- return FXSYS_StrToInt<int32_t, const FX_CHAR*>(str);
+int32_t FXSYS_atoi(const FX_CHAR* str) {
+ return FXSYS_StrToInt<int32_t, const FX_CHAR*>(str);
}
-int32_t FXSYS_wtoi(const FX_WCHAR* str)
-{
- return FXSYS_StrToInt<int32_t, const FX_WCHAR*>(str);
+int32_t FXSYS_wtoi(const FX_WCHAR* str) {
+ return FXSYS_StrToInt<int32_t, const FX_WCHAR*>(str);
}
-int64_t FXSYS_atoi64(const FX_CHAR* str)
-{
- return FXSYS_StrToInt<int64_t, const FX_CHAR*>(str);
+int64_t FXSYS_atoi64(const FX_CHAR* str) {
+ return FXSYS_StrToInt<int64_t, const FX_CHAR*>(str);
}
-int64_t FXSYS_wtoi64(const FX_WCHAR* str)
-{
- return FXSYS_StrToInt<int64_t, const FX_WCHAR*>(str);
+int64_t FXSYS_wtoi64(const FX_WCHAR* str) {
+ return FXSYS_StrToInt<int64_t, const FX_WCHAR*>(str);
}
-const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix)
-{
- return FXSYS_IntToStr<int64_t, FX_CHAR*>(value, str, radix);
+const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix) {
+ return FXSYS_IntToStr<int64_t, FX_CHAR*>(value, str, radix);
}
-const FX_WCHAR* FXSYS_i64tow(int64_t value, FX_WCHAR* str, int radix)
-{
- return FXSYS_IntToStr<int64_t, FX_WCHAR*>(value, str, radix);
+const FX_WCHAR* FXSYS_i64tow(int64_t value, FX_WCHAR* str, int radix) {
+ return FXSYS_IntToStr<int64_t, FX_WCHAR*>(value, str, radix);
}
#ifdef __cplusplus
}
@@ -92,22 +84,22 @@ const FX_WCHAR* FXSYS_i64tow(int64_t value, FX_WCHAR* str, int radix)
#ifdef __cplusplus
extern "C" {
#endif
-int FXSYS_GetACP()
-{
- return 0;
-}
-FX_DWORD FXSYS_GetFullPathName(const FX_CHAR* filename, FX_DWORD buflen, FX_CHAR* buf, FX_CHAR** filepart)
-{
- int srclen = FXSYS_strlen(filename);
- if (buf == NULL || (int)buflen < srclen + 1) {
- return srclen + 1;
- }
- FXSYS_strcpy(buf, filename);
- return srclen;
-}
-FX_DWORD FXSYS_GetModuleFileName(void* hModule, char* buf, FX_DWORD bufsize)
-{
- return (FX_DWORD) - 1;
+int FXSYS_GetACP() {
+ return 0;
+}
+FX_DWORD FXSYS_GetFullPathName(const FX_CHAR* filename,
+ FX_DWORD buflen,
+ FX_CHAR* buf,
+ FX_CHAR** filepart) {
+ int srclen = FXSYS_strlen(filename);
+ if (buf == NULL || (int)buflen < srclen + 1) {
+ return srclen + 1;
+ }
+ FXSYS_strcpy(buf, filename);
+ return srclen;
+}
+FX_DWORD FXSYS_GetModuleFileName(void* hModule, char* buf, FX_DWORD bufsize) {
+ return (FX_DWORD)-1;
}
#ifdef __cplusplus
}
@@ -117,87 +109,80 @@ FX_DWORD FXSYS_GetModuleFileName(void* hModule, char* buf, FX_DWORD bufsize)
#ifdef __cplusplus
extern "C" {
#endif
-FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode)
-{
- return FXSYS_fopen(CFX_ByteString::FromUnicode(filename), CFX_ByteString::FromUnicode(mode));
-}
-char* FXSYS_strlwr(char* str)
-{
- if (str == NULL) {
- return NULL;
- }
- char* s = str;
- while (*str) {
- *str = FXSYS_tolower(*str);
- str ++;
- }
- return s;
-}
-char* FXSYS_strupr(char* str)
-{
- if (str == NULL) {
- return NULL;
- }
- char* s = str;
- while (*str) {
- *str = FXSYS_toupper(*str);
- str ++;
- }
- return s;
-}
-FX_WCHAR* FXSYS_wcslwr(FX_WCHAR* str)
-{
- if (str == NULL) {
- return NULL;
- }
- FX_WCHAR* s = str;
- while (*str) {
- *str = FXSYS_tolower(*str);
- str ++;
- }
- return s;
-}
-FX_WCHAR* FXSYS_wcsupr(FX_WCHAR* str)
-{
- if (str == NULL) {
- return NULL;
- }
- FX_WCHAR* s = str;
- while (*str) {
- *str = FXSYS_toupper(*str);
- str ++;
- }
- return s;
-}
-int FXSYS_stricmp(const char*dst, const char*src)
-{
- int f, l;
- do {
- if ( ((f = (unsigned char)(*(dst++))) >= 'A') && (f <= 'Z') ) {
- f -= ('A' - 'a');
- }
- if ( ((l = (unsigned char)(*(src++))) >= 'A') && (l <= 'Z') ) {
- l -= ('A' - 'a');
- }
- } while ( f && (f == l) );
- return(f - l);
-}
-int FXSYS_wcsicmp(const FX_WCHAR *dst, const FX_WCHAR *src)
-{
- FX_WCHAR f, l;
- do {
- if ( ((f = (FX_WCHAR)(*(dst++))) >= 'A') && (f <= 'Z') ) {
- f -= ('A' - 'a');
- }
- if ( ((l = (FX_WCHAR)(*(src++))) >= 'A') && (l <= 'Z') ) {
- l -= ('A' - 'a');
- }
- } while ( f && (f == l) );
- return(f - l);
-}
-char* FXSYS_itoa(int value, char* string, int radix)
-{
- return FXSYS_IntToStr<int32_t, FX_CHAR*>(value, string, radix);
+FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode) {
+ return FXSYS_fopen(CFX_ByteString::FromUnicode(filename),
+ CFX_ByteString::FromUnicode(mode));
+}
+char* FXSYS_strlwr(char* str) {
+ if (str == NULL) {
+ return NULL;
+ }
+ char* s = str;
+ while (*str) {
+ *str = FXSYS_tolower(*str);
+ str++;
+ }
+ return s;
+}
+char* FXSYS_strupr(char* str) {
+ if (str == NULL) {
+ return NULL;
+ }
+ char* s = str;
+ while (*str) {
+ *str = FXSYS_toupper(*str);
+ str++;
+ }
+ return s;
+}
+FX_WCHAR* FXSYS_wcslwr(FX_WCHAR* str) {
+ if (str == NULL) {
+ return NULL;
+ }
+ FX_WCHAR* s = str;
+ while (*str) {
+ *str = FXSYS_tolower(*str);
+ str++;
+ }
+ return s;
+}
+FX_WCHAR* FXSYS_wcsupr(FX_WCHAR* str) {
+ if (str == NULL) {
+ return NULL;
+ }
+ FX_WCHAR* s = str;
+ while (*str) {
+ *str = FXSYS_toupper(*str);
+ str++;
+ }
+ return s;
+}
+int FXSYS_stricmp(const char* dst, const char* src) {
+ int f, l;
+ do {
+ if (((f = (unsigned char)(*(dst++))) >= 'A') && (f <= 'Z')) {
+ f -= ('A' - 'a');
+ }
+ if (((l = (unsigned char)(*(src++))) >= 'A') && (l <= 'Z')) {
+ l -= ('A' - 'a');
+ }
+ } while (f && (f == l));
+ return (f - l);
+}
+int FXSYS_wcsicmp(const FX_WCHAR* dst, const FX_WCHAR* src) {
+ FX_WCHAR f, l;
+ do {
+ if (((f = (FX_WCHAR)(*(dst++))) >= 'A') && (f <= 'Z')) {
+ f -= ('A' - 'a');
+ }
+ if (((l = (FX_WCHAR)(*(src++))) >= 'A') && (l <= 'Z')) {
+ l -= ('A' - 'a');
+ }
+ } while (f && (f == l));
+ return (f - l);
+}
+char* FXSYS_itoa(int value, char* string, int radix) {
+ return FXSYS_IntToStr<int32_t, FX_CHAR*>(value, string, radix);
}
#ifdef __cplusplus
}
@@ -207,31 +192,39 @@ char* FXSYS_itoa(int value, char* string, int radix)
#ifdef __cplusplus
extern "C" {
#endif
-int FXSYS_WideCharToMultiByte(FX_DWORD codepage, FX_DWORD dwFlags, const FX_WCHAR* wstr, int wlen,
- FX_CHAR* buf, int buflen, const FX_CHAR* default_str, int* pUseDefault)
-{
- int len = 0;
- for (int i = 0; i < wlen; i ++) {
- if (wstr[i] < 0x100) {
- if (buf && len < buflen) {
- buf[len] = (FX_CHAR)wstr[i];
- }
- len ++;
- }
- }
- return len;
-}
-int FXSYS_MultiByteToWideChar(FX_DWORD codepage, FX_DWORD dwFlags, const FX_CHAR* bstr, int blen,
- FX_WCHAR* buf, int buflen)
-{
- int wlen = 0;
- for (int i = 0; i < blen; i ++) {
- if (buf && wlen < buflen) {
- buf[wlen] = bstr[i];
- }
- wlen ++;
- }
- return wlen;
+int FXSYS_WideCharToMultiByte(FX_DWORD codepage,
+ FX_DWORD dwFlags,
+ const FX_WCHAR* wstr,
+ int wlen,
+ FX_CHAR* buf,
+ int buflen,
+ const FX_CHAR* default_str,
+ int* pUseDefault) {
+ int len = 0;
+ for (int i = 0; i < wlen; i++) {
+ if (wstr[i] < 0x100) {
+ if (buf && len < buflen) {
+ buf[len] = (FX_CHAR)wstr[i];
+ }
+ len++;
+ }
+ }
+ return len;
+}
+int FXSYS_MultiByteToWideChar(FX_DWORD codepage,
+ FX_DWORD dwFlags,
+ const FX_CHAR* bstr,
+ int blen,
+ FX_WCHAR* buf,
+ int buflen) {
+ int wlen = 0;
+ for (int i = 0; i < blen; i++) {
+ if (buf && wlen < buflen) {
+ buf[wlen] = bstr[i];
+ }
+ wlen++;
+ }
+ return wlen;
}
#ifdef __cplusplus
}

Powered by Google App Engine
This is Rietveld 408576698