[apophenia] 01/01: Wipe out library exit calls

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository apophenia.

commit eb6761c5c50ac741f544841715c63e82572fe44f
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Sep 9 00:29:24 2014 +0200

    Wipe out library exit calls
---
 debian/changelog                           |  2 +-
 debian/patches/series                      |  1 +
 debian/patches/upstream-wipeout-exit.patch | 39 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e38654b..55b9859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,4 +26,4 @@ apophenia (0.999b+ds-1) unstable; urgency=medium
     discussed; thanks to the upstream maintainer.
   * -
 
- -- Jerome Benoit <calculus at rezozer.net>  Mon, 08 Sep 2014 14:16:25 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 08 Sep 2014 22:25:54 +0000
diff --git a/debian/patches/series b/debian/patches/series
index 515a7e8..1859fea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 upstream-autotools-m4.patch
+upstream-wipeout-exit.patch
 debianization.patch
 debianization-help2man.patch
 debianization-documentation.patch
diff --git a/debian/patches/upstream-wipeout-exit.patch b/debian/patches/upstream-wipeout-exit.patch
new file mode 100644
index 0000000..92f1727
--- /dev/null
+++ b/debian/patches/upstream-wipeout-exit.patch
@@ -0,0 +1,39 @@
+Description: wipe out exit calls
+ Wipe out exit calls as reported by lintian (shlib-calls-exit tag);
+ meant to be submitted to the upstream maintainer.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2014-09-09
+
+--- a/apop_arms.c
++++ b/apop_arms.c
+@@ -241,7 +241,7 @@
+   assert(isfinite(q->y));
+ 
+   /* guard against imprecision yielding point outside interval */
+-  if ((p->x < xl) || (p->x > xr)) exit(1);
++  Apop_stopif( ((p->x < xl) || (p->x > xr)), return,-5, "imprecision yields point outside interval");
+ }
+ 
+ int test(arms_state *env, POINT *p, apop_arms_settings *params, gsl_rng *r){
+@@ -364,7 +364,8 @@
+     q->pl = p->pl;
+     m->pr->pl = m;
+     q->pl->pr = q;
+-  } else exit(10);// this should be impossible 
++  } else
++    Apop_stopif(1, return 1,-5, "unexpected event"); // this should be impossible
+ 
+   /* now adjust position of q within interval if too close to an endpoint */
+   ql = q->pl->pl ? q->pl->pl : q->pl;
+@@ -503,8 +504,8 @@
+ double area(POINT *q){
+ /* To integrate piece of exponentiated envelope to left of POINT q */ 
+ 
+-  if(q->pl == NULL) // this is leftmost point in envelope 
+-      exit(1);
++  if(q->pl == NULL) // this is leftmost point in envelope
++      Apop_stopif(1, return GSL_NAN,-5, "leftmost point in envelope");
+   if(q->pl->x == q->x) // interval is zero length
+       return 0.;
+   if (fabs(q->y - q->pl->y) < YEPS) // integrate straight line piece

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