From 0a171bed072a76219ba87eb0ebdd960ed0dd07a3 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Thu, 4 Jun 2020 14:57:43 -0400
Subject: [PATCH] Fix variable name clash

---
 src/ifm-main.c | 16 ++++++++--------
 src/ifm-main.h |  2 +-
 src/ifm-scan.l |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ifm-main.c b/src/ifm-main.c
index 2e2a92b..3585b78 100644
--- a/src/ifm-main.c
+++ b/src/ifm-main.c
@@ -33,7 +33,7 @@
 #define OUTPUT (write_map || write_items || write_tasks)
 
 char *ifm_format = NULL;        /* Output format name */
-int line_number;                /* Current line number */
+int ifm_line_number;            /* Current line number */
 
 int write_map = 0;              /* Whether to write map */
 int write_items = 0;            /* Whether to write item list */
@@ -333,7 +333,7 @@ parse_input(char *file, int libflag, int required)
     char *path = file;
     int c;
 
-    line_number = 0;
+    ifm_line_number = 0;
 
     if (file == NULL || V_STREQ(file, "-")) {
         strcpy(ifm_input, "<stdin>");
@@ -353,7 +353,7 @@ parse_input(char *file, int libflag, int required)
         strcpy(ifm_input, path);
     }
 
-    line_number = 1;
+    ifm_line_number = 1;
     ifm_errors = 0;
 
     if (path == NULL)
@@ -367,7 +367,7 @@ parse_input(char *file, int libflag, int required)
     yyparse();
 
     fclose(yyin);
-    line_number = 0;
+    ifm_line_number = 0;
     strcpy(ifm_input, "");
 
     return (ifm_errors == 0);
@@ -442,7 +442,7 @@ err(char *fmt, ...)
         if (max_errors > 0 && ifm_errors >= max_errors)
             fatal("too many errors.  Goodbye!");
     } else {
-        func->error(ifm_input, line_number, msg);
+        func->error(ifm_input, ifm_line_number, msg);
     }
 }
 
@@ -463,7 +463,7 @@ warn(char *fmt, ...)
         if (func == NULL)
             message("warning", msg);
         else
-            func->warning(ifm_input, line_number, msg);
+            func->warning(ifm_input, ifm_line_number, msg);
     }
 }
 
@@ -488,8 +488,8 @@ message(char *type, char *msg)
 
     if (strlen(ifm_input) > 0) {
         fprintf(stderr, ": %s", ifm_input);
-        if (line_number > 0)
-            fprintf(stderr, ", line %d", line_number);
+        if (ifm_line_number > 0)
+            fprintf(stderr, ", line %d", ifm_line_number);
     }
 
     fprintf(stderr, ": %s\n", msg);
diff --git a/src/ifm-main.h b/src/ifm-main.h
index 1d1fad5..9a03112 100644
--- a/src/ifm-main.h
+++ b/src/ifm-main.h
@@ -13,7 +13,7 @@
 #define IFM_MAIN_H
 
 /* External vars */
-extern int line_number;
+extern int ifm_line_number;
 extern char *ifm_format;
 extern vlist *ifm_search;
 extern vlist *ifm_styles;
diff --git a/src/ifm-scan.l b/src/ifm-scan.l
index 7767b28..cced6ec 100644
--- a/src/ifm-scan.l
+++ b/src/ifm-scan.l
@@ -45,7 +45,7 @@ VAR             \${ID}
 [ \t\f\r]+ /* Strip whitespace */
 
 \n {
-    line_number++;
+    ifm_line_number++;
 }
 
 \" {
@@ -74,7 +74,7 @@ VAR             \${ID}
         } else if (c == '\n') {
             vb_putc(sbuf, ' ');
             eatspace = 1;
-            line_number++;
+            ifm_line_number++;
         } else if (!eatspace || !isspace(c)) {
             vb_putc(sbuf, c);
         }
-- 
2.26.2