make getfid() more robust and fixed gcc warning

[fw/sdcc] / as / mcs51 / lknoice.c

diff --git a/as/mcs51/lknoice.c b/as/mcs51/lknoice.c
index 22e2d96c507dd1ffad14f1f342dd394a42a07d71..2cd6a91cdcbbbb0164a1efadd4107c7cb3145948 100644 (file)
--- a/as/mcs51/lknoice.c
+++ b/as/mcs51/lknoice.c
@@ -11,17 +11,17 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
-#include <alloc.h>
 #include "aslink.h"
+#include "strcmpi.h"
 
-static void DefineGlobal( char *name, addr_t value, int page );
-static void DefineScoped( char *name, addr_t value, int page );
-static void DefineFile( char *name, addr_t value, int page );
-static void DefineFunction( char *name, addr_t value, int page );
-static void DefineStaticFunction( char *name, addr_t value, int page );
-static void DefineEndFunction( addr_t value, int page );
-static void DefineLine( char *lineString, addr_t value, int page );
-static void PagedAddress( addr_t value, int page );
+static void DefineGlobal( char *name, Addr_T value, int page );
+static void DefineScoped( char *name, Addr_T value, int page );
+static void DefineFile( char *name, Addr_T value, int page );
+static void DefineFunction( char *name, Addr_T value, int page );
+static void DefineStaticFunction( char *name, Addr_T value, int page );
+static void DefineEndFunction( Addr_T value, int page );
+static void DefineLine( char *lineString, Addr_T value, int page );
+static void PagedAddress( Addr_T value, int page );
 
 /*
  * Called from lstarea in lklist.c for each symbol.
@@ -29,7 +29,7 @@ static void PagedAddress( addr_t value, int page );
  * Generates appropriate NoICE commands into output file, if any is open
  *
  */
-void DefineNoICE( char *name, addr_t value, int page )
+void DefineNoICE( char *name, Addr_T value, int page )
 {
        char token1[NCPS];                      /* parse for file.function.symbol */
        char token2[NCPS];
@@ -119,7 +119,7 @@ static char currentFunction[NCPS];
  * static function:
  * Define "name" as a global symbol
  */
-void DefineGlobal( char *name, addr_t value, int page )
+void DefineGlobal( char *name, Addr_T value, int page )
 {
        fprintf( jfp, "DEF %s ", name );
        PagedAddress( value, page );
@@ -129,7 +129,7 @@ void DefineGlobal( char *name, addr_t value, int page )
  * static function:
  * Define "name" as a static (scoped) symbol
  */
-void DefineScoped( char *name, addr_t value, int page )
+void DefineScoped( char *name, Addr_T value, int page )
 {
        fprintf( jfp, "DEFS %s ", name );
        PagedAddress( value, page );
@@ -139,9 +139,9 @@ void DefineScoped( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current file
  */
-void DefineFile( char *name, addr_t value, int page )
+void DefineFile( char *name, Addr_T value, int page )
 {
-       if (strcmpi( name, currentFile ) != 0)
+       if (as_strcmpi( name, currentFile ) != 0)
        {
                strcpy( currentFile, name );
                if (value != 0)
@@ -160,9 +160,9 @@ void DefineFile( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current function
  */
-void DefineFunction( char *name, addr_t value, int page )
+void DefineFunction( char *name, Addr_T value, int page )
 {
-       if (strcmpi( name, currentFunction ) != 0)
+       if (as_strcmpi( name, currentFunction ) != 0)
        {
                strcpy( currentFunction, name );
                 if (value != 0)
@@ -183,9 +183,9 @@ void DefineFunction( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current static (scoped) function
  */
-void DefineStaticFunction( char *name, addr_t value, int page )
+void DefineStaticFunction( char *name, Addr_T value, int page )
 {
-       if (strcmpi( name, currentFunction ) != 0)
+       if (as_strcmpi( name, currentFunction ) != 0)
        {
                strcpy( currentFunction, name );
                if (value != 0)
@@ -206,7 +206,7 @@ void DefineStaticFunction( char *name, addr_t value, int page )
  * static function:
  * Define the end of the current function
  */
-void DefineEndFunction( addr_t value, int page )
+void DefineEndFunction( Addr_T value, int page )
 {
        if (currentFunction[0] != 0)
        {
@@ -228,7 +228,7 @@ void DefineEndFunction( addr_t value, int page )
  * static function:
  * Define "lineNumber" as a line in the current file
  */
-void DefineLine( char *lineString, addr_t value, int page )
+void DefineLine( char *lineString, Addr_T value, int page )
 {
        int indigit, lineNumber = 0;
 
@@ -240,7 +240,7 @@ void DefineLine( char *lineString, addr_t value, int page )
         PagedAddress( value, page );
 }
 
-void PagedAddress( addr_t value, int page )
+void PagedAddress( Addr_T value, int page )
 {
        fprintf( jfp, "%X:0x%X\n", page, value );
 }