[gap-guava] 04/04: upstream: warning fixes
Jerome Benoit
calculus-guest at moszumanska.debian.org
Mon Dec 28 08:01:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository gap-guava.
commit b27192c412c9503fec437c1580e1f79c50c0f528
Author: Jerome Benoit <calculus at rezozer.net>
Date: Mon Dec 28 09:00:34 2015 +0100
upstream: warning fixes
---
debian/changelog | 3 +-
debian/patches/upstream-fix-warnings.patch | 132 ++++++++++++++++++++++++++++-
2 files changed, 133 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d4222b5..7d844dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,10 @@ gap-guava (3.12+ds1-3) unstable; urgency=medium
- debian/clean, harden;
- debian/patches/upstream-doc-reproducible.patch, introduce;
- debian/patches/upstream-configure_machinery-refreshment.patch, harden;
+ - debian/patches/upstream-fix-warnings.patch, refine;
- debug package support, add.
- -- Jerome Benoit <calculus at rezozer.net> Mon, 28 Dec 2015 05:20:47 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Mon, 28 Dec 2015 07:54:11 +0000
gap-guava (3.12+ds1-2) unstable; urgency=medium
diff --git a/debian/patches/upstream-fix-warnings.patch b/debian/patches/upstream-fix-warnings.patch
index 6658dcd..1c8df32 100644
--- a/debian/patches/upstream-fix-warnings.patch
+++ b/debian/patches/upstream-fix-warnings.patch
@@ -3,7 +3,7 @@ Description: fixes for upstream source warnings
meant to be submitted to the upstream maintainer.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-09-06
+Last-Update: 2015-12-28
--- a/src/leonconv.c
+++ b/src/leonconv.c
@@ -17,6 +17,53 @@ Last-Update: 2014-09-06
FILE *in, *out;
+@@ -10,7 +8,7 @@
+ void EquivalentToGuave(char *inputfile, char *outputfile);
+ void WeightToGuave(char *inputfile, char *outputfile);
+
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ char *sw, *inputfile, *outputfile;
+
+@@ -75,7 +73,7 @@
+ res = fscanf(in, "%c", &bit);
+ }
+ fprintf(out, ");\n");
+- close(in);
++ fclose(in);
+ in = fopen(inputfile, "r");
+ res = ReadUntil(in, '\n', 3);
+ res = ReadUntil(in, ':', 1);
+@@ -86,7 +84,7 @@
+ res = fscanf(in, "%c", &bit);
+ }
+ fprintf(out, ");\n");
+- close(in); close(out);
++ fclose(in); fclose(out);
+ }
+
+ void ConstWeightToGuave(char *inputfile, char *outputfile) {
+@@ -110,7 +108,7 @@
+ else fprintf(out, "]");
+ }
+ fprintf(out, "];\n");
+- close(in); close(out);
++ fclose(in); fclose(out);
+ }
+
+ void EquivalentToGuave(char *inputfile, char *outputfile) {
+@@ -155,8 +153,8 @@
+ }
+ }
+ fprintf(out, "\n");
+- if (!noteq) close(in);
+- close(out);
++ if (!noteq) fclose(in);
++ fclose(out);
+ }
+
+ void WeightToGuave(char *inputfile, char *outputfile) {
--- a/src/leon/src/errmesg.h
+++ b/src/leon/src/errmesg.h
@@ -2,33 +2,33 @@
@@ -483,6 +530,15 @@ Last-Update: 2014-09-06
reducingRefn.priority = thisPriority;
--- a/src/leon/src/relator.c
+++ b/src/leon/src/relator.c
+@@ -30,7 +30,7 @@
+ Unsigned degree);
+ BOOLEAN onFreeList(
+ Unsigned coset);
+-static callCount = 0; /*DEBUG*/
++/* static callCount = 0; */ /*DEBUG*/
+
+
+ /*-------------------------- relatorLevel ---------------------------------*/
@@ -166,7 +166,7 @@
for ( i = 1 ; i <= symLength ; ++i ) {
++addCount;
@@ -588,3 +644,77 @@ Last-Update: 2014-09-06
char tempArg[8];
enum { SET_STAB, SET_IMAGE, PARTN_STAB, PARTN_IMAGE,
UPARTN_STAB, UPARTN_IMAGE} computationType = SET_STAB;
+--- a/src/leon/src/desauto.c
++++ b/src/leon/src/desauto.c
+@@ -20,7 +20,7 @@
+ <design2>: The second of the two designs to be checked for isomorphism.
+ <isoPerm>: Set to a permutation mapping <design1> to <design2>, if one
+ exists. Not created otherwise. Depending on the options,
+- this will be set to a permutation on points only or on points
++ this will be set to a permutation on points only or on points
+ The name of the file in which the set stabilizer G_Lambda
+ and blocks.
+
+@@ -499,7 +499,8 @@
+ "Designs have different numbers of points.")
+ if ( matrix_L->numberOfCols != matrix_R->numberOfCols ) {
+ if ( options.inform ) {
+- printf( "\n\n%s and %s are not isomorphic. ");
++ printf( "\n\n%s and %s are not isomorphic. ",
++ matrix_L->name, matrix_R->name);
+ printf( "They have %u and %u blocks, respectively.\n\n",
+ matrix_L->numberOfCols, matrix_R->numberOfCols);
+ }
+@@ -552,7 +553,8 @@
+ 0);
+ if ( C_L->dimension != C_R->dimension ) {
+ if ( options.inform ) {
+- printf( "\n\n%s and %s are not isomorphic. ");
++ printf( "\n\n%s and %s are not isomorphic. ",
++ C_L->name, C_R->name);
+ printf( "They have dimension %u and %u, respectively.\n\n",
+ C_L->dimension, C_R->dimension);
+ }
+@@ -560,7 +562,8 @@
+ }
+ if ( matrix_L->numberOfCols != matrix_R->numberOfCols ) {
+ if ( options.inform ) {
+- printf( "\n\n%s and %s are not isomorphic. ");
++ printf( "\n\n%s and %s are not isomorphic. ",
++ matrix_L->name, matrix_R->name);
+ printf( "The invariant vector sets have different sizes.\n");
+ }
+ return 1;
+--- a/src/leon/src/token.c
++++ b/src/leon/src/token.c
+@@ -29,7 +29,7 @@
+ returned. */
+ static BOOLEAN endOfStringReached; /* True if end of string has been reached. */
+
+-static recognizeKeywordFlag = TRUE; /* If false, a colon is treated as an
++static BOOLEAN recognizeKeywordFlag = TRUE; /* If false, a colon is treated as an
+ ordinary character. Keywords are not
+ recognized. */
+
+--- a/src/leon/src/cjrndper.c
++++ b/src/leon/src/cjrndper.c
+@@ -566,7 +566,7 @@
+ {
+ Unsigned i, j, k, delta, lambda, temp, m, mu;
+ const Unsigned fSize = field->size - 1;
+- const degree = perm->degree;
++ const Unsigned degree = perm->degree;
+
+ for ( i = 1 ; i <= degree ; i += fSize ) {
+ j = randInteger( i, (i <= subDegree) ? subDegree : degree);
+--- a/src/leon/src/wtdist.c
++++ b/src/leon/src/wtdist.c
+@@ -710,7 +710,7 @@
+ FieldElement *x, *y;
+ Unsigned *primeBasisVector;
+ const Unsigned fieldExponent = (C->fieldSize == 2) ? 1 : C->field->exponent;
+- const primeDimension = C->dimension * fieldExponent;
++ const Unsigned primeDimension = C->dimension * fieldExponent;
+
+ primeBasisVector = (Unsigned *) malloc( (C->length+1) * sizeof(Unsigned));
+ if ( !primeBasisVector )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-guava.git
More information about the debian-science-commits
mailing list