[med-svn] [Git][med-team/acedb][master] Fix more implicit declarations

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / acedb


Commits:
e3e7870a by Andreas Tille at 2024-04-14T10:14:15+02:00
Fix more implicit declarations

- - - - -


3 changed files:

- debian/patches/acedb-parser-fixes.patch
- debian/patches/acedb-signal-fix.patch
- debian/patches/fix_implicit_declaration.patch


Changes:

=====================================
debian/patches/acedb-parser-fixes.patch
=====================================
@@ -5,11 +5,9 @@ Description: Fix missing declarations
              `yyerror` - this is present but hidden by a CPP conditional
              `yywrap`  - this is not needed (grep for "YY_SKIP_YYWRAP") and can be disabled
 
-diff --git a/waql/aql_.h b/waql/aql_.h
-index cde94a97896b..dd3b89116280 100644
 --- a/waql/aql_.h
 +++ b/waql/aql_.h
-@@ -448,7 +448,7 @@ char* aqlNodeTypeName (AqlNodeType inType);
+@@ -448,7 +448,7 @@ char* aqlNodeTypeName (AqlNodeType inTyp
  char* aqlOpTypeName (AqlOpType inType);
  char* aqlLocSourceTypeName (AqlLocSourceType inType);
  
@@ -18,8 +16,6 @@ index cde94a97896b..dd3b89116280 100644
  /* predeclare lex.yy.c fns */
  void yyerror (char *s);
  #endif
-diff --git a/waql/aqlparse.l b/waql/aqlparse.l
-index 313375027957..bc232e0a4c48 100644
 --- a/waql/aqlparse.l
 +++ b/waql/aqlparse.l
 @@ -102,6 +102,8 @@
@@ -31,8 +27,6 @@ index 313375027957..bc232e0a4c48 100644
  letter			[A-Za-z]
  digit			[0-9]
  id			{letter}({letter}|{digit}|"_")*
-diff --git a/waql/aqlparse.y b/waql/aqlparse.y
-index 9989831a4838..975ae325c14c 100644
 --- a/waql/aqlparse.y
 +++ b/waql/aqlparse.y
 @@ -77,6 +77,8 @@ static int tokPos[1024];


=====================================
debian/patches/acedb-signal-fix.patch
=====================================
@@ -2,11 +2,9 @@ Author: Jeremy Sowden <azazel at debian.org>
 Last-Update: Sat, 13 Apr 2024 22:46:17 +0100
 Description: Add undeclared identifier
 
-diff --git a/w4/sigsubs.c b/w4/sigsubs.c
-index 2fd0c6ce9155..9d2942df1642 100644
 --- a/w4/sigsubs.c
 +++ b/w4/sigsubs.c
-@@ -467,6 +467,10 @@ static char *getSignalText(int sig_num)
+@@ -470,6 +470,10 @@ static char *getSignalText(int sig_num)
  
    return "unknown";
  
@@ -17,7 +15,7 @@ index 2fd0c6ce9155..9d2942df1642 100644
  #else
  
    char *sig_text = NULL ;
-@@ -485,7 +489,7 @@ static char *getSignalText(int sig_num)
+@@ -488,7 +492,7 @@ static char *getSignalText(int sig_num)
  
    char **signal_textlist = &(_sys_siglist[0]) ;
  


=====================================
debian/patches/fix_implicit_declaration.patch
=====================================
@@ -54,3 +54,22 @@ Forwarded: No (orphaned upstream)
 +IdError idaAddNameType (IdCnxn ix, char *domain, BOOL isUnique, BOOL isPrimary);
 +
  #endif /* !IDCURATE_ACEDB_H */
+--- a/wh/lex.h
++++ b/wh/lex.h
+@@ -37,7 +37,7 @@
+ /************************************************************/
+ 
+ #include <wh/disk.h>		/* for DISK type */
+-
++#include <wh/acelib_.h>
+ 
+ /* Returned by iskey, LEXKEY_IS_UNKNOWN: key is not known to acedb
+  *                        LEXKEY_IS_VOC: key is vocabulary entry only
+@@ -52,6 +52,7 @@ int   lexMax(int t) ;  /* Numbers of ent
+ int   lexi2Max(int t) ;  /* Numbers of cached entries of the t lexique */
+ int   vocMax(int t) ;
+ void  lex2clear (KEY key) ; /* call this function to clear the lex2 array */
++KEYSET lexAlphaClassList (BOOL redo);
+ 
+ LexKeyType   iskey(KEY kk);
+ BOOL  iskeyold(KEY kk);					    /* TRUE if key is on disk or in first cache */



View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/e3e7870a9cec40aad7e70a50f95bae382bebcda3

-- 
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/e3e7870a9cec40aad7e70a50f95bae382bebcda3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240414/89e220b7/attachment-0001.htm>