From 5e190b8aeb7b2e7103a8ab8bb03570290d0ade8f Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 8 Aug 2014 12:44:27 +0200
Subject: [PATCH] Minor renamings and type fiddling.

---
 frontend/maingui.cpp |  4 ++--
 lib/ttfautohint.c    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/maingui.cpp b/frontend/maingui.cpp
index 110bdcb..243c218 100644
--- a/frontend/maingui.cpp
+++ b/frontend/maingui.cpp
@@ -722,8 +722,8 @@ struct GUI_Error_Data
 void
 gui_error(TA_Error error,
           const char* error_string,
-          unsigned int /* linenum */,
-          const char* /* line */,
+          unsigned int /* errlinenum */,
+          const char* /* errline */,
           const char* /* errpos */,
           void* user)
 {
diff --git a/lib/ttfautohint.c b/lib/ttfautohint.c
index 0d97045..7c6ae86 100644
--- a/lib/ttfautohint.c
+++ b/lib/ttfautohint.c
@@ -64,9 +64,9 @@ TTF_autohint(const char* options,
 
   FT_Error error;
   const char* error_string = NULL;
-  unsigned int linenum = 0;
-  const char* line = NULL;
-  const char* errpos = NULL;
+  unsigned int errlinenum = 0;
+  char* errline = NULL;
+  char* errpos = NULL;
 
   FILE* in_file = NULL;
   FILE* out_file = NULL;
@@ -373,9 +373,9 @@ TTF_autohint(const char* options,
     {
       /* we map numberset.h's error codes to values starting with 0x100 */
       error = 0x100 - (FT_Error)x_height_snapping_exceptions;
-      line = x_height_snapping_exceptions_string;
-      linenum = 0;
-      errpos = s;
+      errlinenum = 0;
+      errline = (char*)x_height_snapping_exceptions_string;
+      errpos = (char*)s;
 
       goto Err1;
     }
@@ -697,8 +697,8 @@ Err1:
   if (err)
     err(error,
         error_string,
-        linenum,
-        line,
+        errlinenum,
+        errline,
         errpos,
         err_data);
 
-- 
2.11.4.GIT