[Debian-astro-commits] [skycat] 02/04: String handling bug fixes.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository skycat.

commit 196962682580654960890a4b00ad101bc9ffb1e4
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Aug 5 14:04:51 2017 +0200

    String handling bug fixes.
    
    Closes: #853662
---
 debian/patches/String-handling-bug-fixes.patch | 73 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 74 insertions(+)

diff --git a/debian/patches/String-handling-bug-fixes.patch b/debian/patches/String-handling-bug-fixes.patch
new file mode 100644
index 0000000..f7045ea
--- /dev/null
+++ b/debian/patches/String-handling-bug-fixes.patch
@@ -0,0 +1,73 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 5 Aug 2017 11:37:20 +0200
+Subject: String handling bug fixes.
+
+Closes: #853662
+---
+ cat/generic/TclAstroCat.C |  2 +-
+ rtd/generic/BiasData.C    |  2 +-
+ rtd/generic/RtdPerf.C     | 26 +++++++++++++-------------
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/cat/generic/TclAstroCat.C b/cat/generic/TclAstroCat.C
+index a4412f2..a3df38a 100644
+--- a/cat/generic/TclAstroCat.C
++++ b/cat/generic/TclAstroCat.C
+@@ -82,7 +82,7 @@ static char initScript[] = "if {[info proc ::cat::Init]==\"\"} {\n\
+  */
+ static class TclAstroCatSubCmds {
+ public:
+-    char* name;      // method name
++    const char* name;      // method name
+     int (TclAstroCat::*fptr)(int argc, char* argv[]);
+     int min_args;    // minimum number of args
+     int max_args;    // maximum number of args
+diff --git a/rtd/generic/BiasData.C b/rtd/generic/BiasData.C
+index c2e7791..62286ea 100644
+--- a/rtd/generic/BiasData.C
++++ b/rtd/generic/BiasData.C
+@@ -76,7 +76,7 @@ int BiasData::off()
+ char* BiasData::file(int nr)
+ {
+     if (nr < 0 || nr >=MAXBIAS)
+-	return '\0';
++	return "";
+     return &files_[nr][0];
+ }
+ 
+diff --git a/rtd/generic/RtdPerf.C b/rtd/generic/RtdPerf.C
+index b72078d..1e22b72 100644
+--- a/rtd/generic/RtdPerf.C
++++ b/rtd/generic/RtdPerf.C
+@@ -226,18 +226,18 @@ void RtdPerf::reset()
+     accGENtime_    = accTCLtime_ = accXtime_ = accFREQtime_ = 0.0;
+ 
+     // Clear the Tcl variables.
+-    Tcl_SetVar2(interp_, var, "PERF_COUNT",     '\0', TCL_GLOBAL_ONLY);
+-
+-    Tcl_SetVar2(interp_, var, "PERF_FREQ",      '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_GEN",       '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_XFUNC",     '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_TCL",       '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_TOTAL",     '\0', TCL_GLOBAL_ONLY);
+-
+-    Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE",  '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_GEN_AVE",   '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_TCL_AVE",   '\0', TCL_GLOBAL_ONLY);
+-    Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", '\0', TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_COUNT",     "", TCL_GLOBAL_ONLY);
++
++    Tcl_SetVar2(interp_, var, "PERF_FREQ",      "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_GEN",       "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_XFUNC",     "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_TCL",       "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_TOTAL",     "", TCL_GLOBAL_ONLY);
++
++    Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE",  "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_GEN_AVE",   "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_TCL_AVE",   "", TCL_GLOBAL_ONLY);
++    Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", "", TCL_GLOBAL_ONLY);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3b6e8b6..fb177c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ Remove-Tclx-dependency.patch
 Replace-iqefunc.c-with-a-version-that-does-not-need-NR-co.patch
 Remove-lines-that-lead-to-crash-with-ImageBias.patch
 Use-Tcl-Tk-stubs.patch
+String-handling-bug-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/skycat.git