[med-svn] [Git][med-team/cdbfasta][upstream] New upstream version 1.00+git20230710.da8f5ba+dfsg

[Andreas Tille (@tille)]

Andreas Tille pushed to branch upstream at Debian Med / cdbfasta


Commits:
98a3343e by Andreas Tille at 2023-11-27T16:12:46+01:00
New upstream version 1.00+git20230710.da8f5ba+dfsg
- - - - -


2 changed files:

- Makefile
- gcdbz.cpp


Changes:

=====================================
Makefile
=====================================
@@ -1,6 +1,8 @@
 GCLDIR := ./gclib
 SEARCHDIRS := -I${GCLDIR}
-CC      := g++
+# Use the correct compiler (CXX, not CC) and respect the environment
+# by using ?=
+CXX    ?= g++
 
 BASEFLAGS  = -Wall ${SEARCHDIRS} $(MARCH) -DENABLE_COMPRESSION=1 -D_FILE_OFFSET_BITS=64 \
 -D_LARGEFILE_SOURCE -fno-exceptions -fno-rtti -fno-strict-aliasing \
@@ -9,39 +11,38 @@ BASEFLAGS  = -Wall ${SEARCHDIRS} $(MARCH) -DENABLE_COMPRESSION=1 -D_FILE_OFFSET_
 
 ifeq ($(findstring debug,$(MAKECMDGOALS)),)
   DBGFLAGS = -O2 -g -DNDEBUG
-  LDFLAGS =
 else
   DBGFLAGS = -g -DDEBUG -D_DEBUG
-  LDFLAGS = -g
+  LDFLAGS += -g
 endif
 
 ifeq ($(findstring nommap,$(MAKECMDGOALS)),)
-  CFLAGS = $(DBGFLAGS) $(BASEFLAGS)
+  CXXFLAGS += $(DBGFLAGS) $(BASEFLAGS)
 else
-  CFLAGS = $(DBGFLAGS) $(BASEFLAGS) -DNO_MMAP
+  CXXFLAGS += $(DBGFLAGS) $(BASEFLAGS) -DNO_MMAP
 endif
 
 %.o : %.c
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cc
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.C
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cpp
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cxx
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 # C/C++ linker
 
-LINKER    := g++
+LINKER    := ${CXX}
 #LDFLAGS = 
 #uncomment this when ENABLE_COMPRESSION
-LDFLAGS    = -lz
+LDFLAGS    += -lz
 
 .PHONY : all
 all:    cdbfasta cdbyank 


=====================================
gcdbz.cpp
=====================================
@@ -110,7 +110,6 @@ char* GCdbz::compress(GReadBuf *readbuf, char* delim) {
   // (exactly as left after a previous call)
  if (zf==NULL || uncompress)
     GError("GCdbz Error: cannot use compress() method !\n");
- unsigned int total_out=0;
  int c=0;
  bool in_rec=true;
  int delimlen=strlen(delim);
@@ -165,7 +164,6 @@ char* GCdbz::compress(GReadBuf *readbuf, char* delim) {
         if (toWrite>0) {
              if (fwrite(lbuf, 1, toWrite, zf)<toWrite)
                 GError("Error writing deflate chunk!\n");
-             total_out+=toWrite;
              zrecsize+=toWrite;
              zpos+=toWrite;
              }



View it on GitLab: https://salsa.debian.org/med-team/cdbfasta/-/commit/98a3343e64ab5fb6f5c3882a90635dae01ddfa1a

-- 
View it on GitLab: https://salsa.debian.org/med-team/cdbfasta/-/commit/98a3343e64ab5fb6f5c3882a90635dae01ddfa1a
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/20231127/8d93ea37/attachment-0001.htm>