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

Unified Diff: xfa/fxfa/fm2js/xfa_error.h

Issue 1921323002: Fix Wvarargs warning in XFA error code. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 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: xfa/fxfa/fm2js/xfa_error.h
diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/xfa_error.h
index 2415cd321263bdf07c19ba1f2af753854c8c6c61..f036f1d1626edb5ce3e21bc76bc9c84b66b5da2f 100644
--- a/xfa/fxfa/fm2js/xfa_error.h
+++ b/xfa/fxfa/fm2js/xfa_error.h
@@ -10,18 +10,15 @@
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
Tom Sepez 2016/04/26 15:51:04 what if you did enum XFA_FM_ERRMSG : uint32_t {
dsinclair 2016/04/26 15:57:39 Nope, same error.
-enum XFA_FM_ERRMSG {
- FMERR_UNSUPPORTED_CHAR,
- FMERR_BAD_SUFFIX_NUMBER,
- FMERR_INVALIDATE_CHAR,
- FMERR_EXPECTED_IDENTIFIER,
- FMERR_EXPECTED_TOKEN,
- FMERR_EXPECTED_IFEND,
- FMERR_UNEXPECTED_EXPRESSION,
- FMERR_EXPTECTED_OPERATOR,
- FMERR_EXPECTED_NON_EMPTY_EXPRESSION,
- FMERR_MAXIMUM
-};
+#define FMERR_UNSUPPORTED_CHAR L"unsupported char '%c'"
Tom Sepez 2016/04/26 16:03:58 I think I'd be happier if we had extern const FX_W
dsinclair 2016/04/26 16:36:46 Done.
+#define FMERR_BAD_SUFFIX_NUMBER L"bad suffix on number"
+#define FMERR_INVALIDATE_CHAR L"invalidate char '%c'"
+#define FMERR_EXPECTED_IDENTIFIER L"expected identifier instead of '%s'"
+#define FMERR_EXPECTED_TOKEN L"expected '%s' instead of '%s'"
+#define FMERR_EXPECTED_IFEND L"expected 'endif' instead of '%s'"
+#define FMERR_UNEXPECTED_EXPRESSION L"unexpected expression '%s'"
+#define FMERR_EXPTECTED_OPERATOR L"expected operator '%s' instead of '%s'"
+#define FMERR_EXPECTED_NON_EMPTY_EXPRESSION L"expected non-empty expression"
class CXFA_FMErrorInfo {
public:
@@ -30,6 +27,5 @@ class CXFA_FMErrorInfo {
uint32_t linenum;
CFX_WideString message;
};
-const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg);
#endif // XFA_FXFA_FM2JS_XFA_ERROR_H_
« no previous file with comments | « xfa.gyp ('k') | xfa/fxfa/fm2js/xfa_error.cpp » ('j') | xfa/fxfa/fm2js/xfa_error.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698