Remove typdefs for pointer types in fx_system.h.

This involves fixing some multiple variable per line
declarations, as the textually-substituted "*" applies
only to the first one.

This involves moving some consts around following the
substitution.

This involves replacing some typedefs used as constructors
with better code.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1171733003

5 files changed, 15 insertions, 15 deletions

diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h
index 46c6e2b532..cc1e3904bd 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/src/fxcodec/jbig2/JBig2_Define.h
@@ -24,7 +24,7 @@ typedef struct {
     int32_t code;
 } JBig2HuffmanCode;
 extern "C" {
-    void _FaxG4Decode(void *pModule, FX_LPCBYTE src_buf, FX_DWORD src_size, int* pbitpos, FX_LPBYTE dest_buf, int width, int height, int pitch = 0);
+    void _FaxG4Decode(void *pModule, const uint8_t* src_buf, FX_DWORD src_size, int* pbitpos, uint8_t* dest_buf, int width, int height, int pitch = 0);
 };
 #define JBIG2_MAX_REFERRED_SEGMENT_COUNT		64
 #define JBIG2_MAX_EXPORT_SYSMBOLS				65535
diff --git a/core/src/fxcodec/jbig2/JBig2_Module.h b/core/src/fxcodec/jbig2/JBig2_Module.h
index aef31bb49f..5a96f4395e 100644
--- a/core/src/fxcodec/jbig2/JBig2_Module.h
+++ b/core/src/fxcodec/jbig2/JBig2_Module.h
@@ -18,16 +18,16 @@ public:
 
     virtual void *JBig2_Malloc3(FX_DWORD num, FX_DWORD dwSize, FX_DWORD dwSize2) = 0;
 
-    virtual void *JBig2_Realloc(FX_LPVOID pMem, FX_DWORD dwSize) = 0;
+    virtual void *JBig2_Realloc(void* pMem, FX_DWORD dwSize) = 0;
 
-    virtual void JBig2_Free(FX_LPVOID pMem) = 0;
+    virtual void JBig2_Free(void* pMem) = 0;
 
     virtual void JBig2_Assert(int32_t nExpression) {};
 
-    virtual	void JBig2_Error(FX_LPCSTR format, ...) {};
+    virtual	void JBig2_Error(const FX_CHAR* format, ...) {};
 
-    virtual void JBig2_Warn(FX_LPCSTR format, ...) {};
+    virtual void JBig2_Warn(const FX_CHAR* format, ...) {};
 
-    virtual void JBig2_Log(FX_LPCSTR format, ...) {};
+    virtual void JBig2_Log(const FX_CHAR* format, ...) {};
 };
 #endif
diff --git a/core/src/fxcodec/jbig2/JBig2_Object.cpp b/core/src/fxcodec/jbig2/JBig2_Object.cpp
index 4bb00b897b..1429a91644 100644
--- a/core/src/fxcodec/jbig2/JBig2_Object.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Object.cpp
@@ -6,14 +6,14 @@
 
 #include "JBig2_Object.h"
 #include "JBig2_Module.h"
-void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule, FX_LPCSTR filename, int line)
+void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule, const FX_CHAR* filename, int line)
 {
     CJBig2_Object *p;
     p = (CJBig2_Object *)pModule->JBig2_Malloc((FX_DWORD)size);
     p->m_pModule = pModule;
     return p;
 }
-void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule, FX_LPCSTR filename, int line)
+void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule, const FX_CHAR* filename, int line)
 {
     pModule->JBig2_Free(p);
 }
@@ -33,7 +33,7 @@ void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule)
     pModule->JBig2_Free(p);
 }
 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size,
-                                    FX_LPCSTR filename, int line)
+                                    const FX_CHAR* filename, int line)
 {
     void *p;
     uint8_t *pCur, *pEnd;
@@ -46,7 +46,7 @@ void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t
     return p;
 }
 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t unit_size,
-                                      FX_LPCSTR filename, int line)
+                                      const FX_CHAR* filename, int line)
 {
     pModule->JBig2_Free(p);
 }
diff --git a/core/src/fxcodec/jbig2/JBig2_Object.h b/core/src/fxcodec/jbig2/JBig2_Object.h
index 23eecbf171..150a8e7e99 100644
--- a/core/src/fxcodec/jbig2/JBig2_Object.h
+++ b/core/src/fxcodec/jbig2/JBig2_Object.h
@@ -13,9 +13,9 @@ class CJBig2_Object
 {
 public:
 
-    void *operator new(size_t size, CJBig2_Module *pModule, FX_LPCSTR filename, int line);
+    void *operator new(size_t size, CJBig2_Module *pModule, const FX_CHAR* filename, int line);
 
-    void operator delete(void *p, CJBig2_Module *pModule, FX_LPCSTR filename, int line);
+    void operator delete(void *p, CJBig2_Module *pModule, const FX_CHAR* filename, int line);
 
     void *operator new(size_t size, CJBig2_Module *pModule);
 
@@ -24,10 +24,10 @@ public:
     void operator delete(void *p, CJBig2_Module *pModule);
 
     void *operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size,
-                         FX_LPCSTR filename, int line);
+                         const FX_CHAR* filename, int line);
 
     void operator delete[](void *p, CJBig2_Module *pModule, size_t unit_size,
-                           FX_LPCSTR filename, int line);
+                           const FX_CHAR* filename, int line);
 
     void *operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size);
 
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h
index fe44bc962d..b61e8e5075 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.h
@@ -62,7 +62,7 @@ public:
         CJBig2_PatternDict	*pd;
         CJBig2_Image		*im;
         CJBig2_HuffmanTable	*ht;
-        FX_LPVOID			 vd;
+        void*			 vd;
     } m_Result;
 };
 #endif