[SCM] CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences branch, debian-patches/2006.dfsg.2-15, updated. upstream/2006.dfsg.2-15-g2caca62
Lifeng Sun
lifongsun at gmail.com
Fri Mar 18 08:38:41 UTC 2011
The following commit has been merged in the debian-patches/2006.dfsg.2-15 branch:
commit 3b358e73ffeab5c763330ad6bbb6ae30fd5aa2e5
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Fri Mar 18 10:53:05 2011 +0800
Update patch 119.
* Truncate overlong initialization string.
* Replace obsolete sys_errlist with strerror.
* Include stdlib.h to declare 'free' function.
diff --git a/debian/patches/119-fix-compiler-warnings.dpatch b/debian/patches/119-fix-compiler-warnings.dpatch
index 341f1a1..48487b2 100755
--- a/debian/patches/119-fix-compiler-warnings.dpatch
+++ b/debian/patches/119-fix-compiler-warnings.dpatch
@@ -3,12 +3,13 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix numerous minor compiler warnings. Patch from Harald Vogt,
-## DP: 2006-07-20.
+## DP: 2006-07-20, and Lifeng Sun, 2011-03-18.
@DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/graflib/dzdoc/dzdkern/dzdcod.F cernlib-2005.dfsg/src/graflib/dzdoc/dzdkern/dzdcod.F
---- cernlib-2005.dfsg~/src/graflib/dzdoc/dzdkern/dzdcod.F 1996-03-04 11:12:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/graflib/dzdoc/dzdkern/dzdcod.F 2006-09-06 19:53:39.375157506 -0400
+diff --git a/src/graflib/dzdoc/dzdkern/dzdcod.F b/src/graflib/dzdoc/dzdkern/dzdcod.F
+index 31fd498..25d80ff 100644
+--- a/src/graflib/dzdoc/dzdkern/dzdcod.F
++++ b/src/graflib/dzdoc/dzdkern/dzdcod.F
@@ -90,7 +90,9 @@
CALL DZDPLN(LUN,' ',99)
ELSE
@@ -20,9 +21,10 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/dzdoc/dzdkern/dzdcod.F cernlib-2005.d
* finish line with bookings
CALL DZDPLN(LUN,' ',99)
ENDIF
-diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/gifencode.c cernlib-2005.dfsg/src/graflib/higz/higzcc/gifencode.c
---- cernlib-2005.dfsg~/src/graflib/higz/higzcc/gifencode.c 1996-02-14 08:10:25.000000000 -0500
-+++ cernlib-2005.dfsg/src/graflib/higz/higzcc/gifencode.c 2006-09-06 19:53:39.376157293 -0400
+diff --git a/src/graflib/higz/higzcc/gifencode.c b/src/graflib/higz/higzcc/gifencode.c
+index cd00c48..dd1bcfb 100644
+--- a/src/graflib/higz/higzcc/gifencode.c
++++ b/src/graflib/higz/higzcc/gifencode.c
@@ -12,6 +12,7 @@
/*-- Author : E.Chernyaev 19/01/94*/
#include <stdio.h>
@@ -31,9 +33,10 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/gifencode.c cernlib-2005.
#ifdef __STDC__
#define ARGS(alist) alist
-diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/imgpickpalette.c cernlib-2005.dfsg/src/graflib/higz/higzcc/imgpickpalette.c
---- cernlib-2005.dfsg~/src/graflib/higz/higzcc/imgpickpalette.c 1998-11-13 08:19:53.000000000 -0500
-+++ cernlib-2005.dfsg/src/graflib/higz/higzcc/imgpickpalette.c 2006-09-06 19:53:39.376157293 -0400
+diff --git a/src/graflib/higz/higzcc/imgpickpalette.c b/src/graflib/higz/higzcc/imgpickpalette.c
+index 9419d63..0e1f1d1 100644
+--- a/src/graflib/higz/higzcc/imgpickpalette.c
++++ b/src/graflib/higz/higzcc/imgpickpalette.c
@@ -30,6 +30,7 @@
#if defined(CERNLIB_GIF)
#include <X11/Xlib.h>
@@ -42,9 +45,10 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/imgpickpalette.c cernlib-
void CollectImageColors(unsigned long, unsigned long **, int *, int *);
int FindColor(unsigned long, unsigned long *, int);
-diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.dfsg/src/graflib/higz/higzcc/rotated.c
---- cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c 1998-01-30 10:22:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/graflib/higz/higzcc/rotated.c 2006-09-06 19:53:39.377157080 -0400
+diff --git a/src/graflib/higz/higzcc/rotated.c b/src/graflib/higz/higzcc/rotated.c
+index c291bbd..2ffb186 100644
+--- a/src/graflib/higz/higzcc/rotated.c
++++ b/src/graflib/higz/higzcc/rotated.c
@@ -35,7 +35,9 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@ -55,7 +59,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
/* ************************************************************************ *
*
-@@ -482,10 +484,10 @@
+@@ -482,10 +484,10 @@ static int XRotPaintAlignedString(dpy, font, angle, drawable, gc, x, y, text,
/* get a rotated bitmap */
item=XRotRetrieveFromCache(dpy, font, angle, text, align);
@@ -68,7 +72,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XCopyGC(dpy, gc, GCForeground|GCBackground|GCFunction|GCPlaneMask,
my_gc);
-@@ -549,7 +551,7 @@
+@@ -549,7 +551,7 @@ static int XRotPaintAlignedString(dpy, font, angle, drawable, gc, x, y, text,
empty_stipple=XCreatePixmap(dpy, drawable, 1, 1, 1);
@@ -77,7 +81,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XSetForeground(dpy, depth_one_gc, 0);
XFillRectangle(dpy, empty_stipple, depth_one_gc, 0, 0, 2, 2);
-@@ -605,7 +607,7 @@
+@@ -605,7 +607,7 @@ static int XRotPaintAlignedString(dpy, font, angle, drawable, gc, x, y, text,
item->cols_out, item->rows_out, 1);
/* create a GC */
@@ -86,7 +90,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XSetForeground(dpy, depth_one_gc, 1);
XSetBackground(dpy, depth_one_gc, 0);
-@@ -705,7 +707,7 @@
+@@ -705,7 +707,7 @@ static int XRotDrawHorizontalString(dpy, font, drawable, gc, x, y, text,
DEBUG_PRINT1("**\nHorizontal text.\n");
/* this gc has similar properties to the user's gc (including stipple) */
@@ -95,7 +99,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XCopyGC(dpy, gc,
GCForeground|GCBackground|GCFunction|GCStipple|GCFillStyle|
GCTileStipXOrigin|GCTileStipYOrigin|GCPlaneMask, my_gc);
-@@ -918,7 +920,7 @@
+@@ -918,7 +920,7 @@ static RotatedTextItem *XRotRetrieveFromCache(dpy, font, angle, text, align)
item->cols_out, item->rows_out, 1);
/* depth one gc */
@@ -104,7 +108,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XSetBackground(dpy, depth_one_gc, 0);
XSetForeground(dpy, depth_one_gc, 1);
-@@ -1032,7 +1034,7 @@
+@@ -1032,7 +1034,7 @@ static RotatedTextItem *XRotCreateTextItem(dpy, font, angle, text, align)
item->cols_in, item->rows_in, 1);
/* create a GC for the bitmap */
@@ -113,10 +117,11 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/rotated.c cernlib-2005.df
XSetBackground(dpy, font_gc, 0);
XSetFont(dpy, font_gc, font->fid);
-diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfsg/src/graflib/higz/higzcc/x11int.c
---- cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c 2000-07-08 02:19:30.000000000 -0400
-+++ cernlib-2005.dfsg/src/graflib/higz/higzcc/x11int.c 2006-09-06 19:53:39.378156868 -0400
-@@ -1172,8 +1172,8 @@
+diff --git a/src/graflib/higz/higzcc/x11int.c b/src/graflib/higz/higzcc/x11int.c
+index 9a186a0..ac0d20b 100644
+--- a/src/graflib/higz/higzcc/x11int.c
++++ b/src/graflib/higz/higzcc/x11int.c
+@@ -1172,8 +1172,8 @@ int *flag;
*/
cws->drawing = cws->window;
cws->buffer = (Drawable)NULL;
@@ -127,7 +132,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
cws->width = wval;
cws->height = hval;
-@@ -1509,7 +1509,7 @@
+@@ -1509,7 +1509,7 @@ Drawable *pix;
void
ixclsds()
{
@@ -136,7 +141,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
int i;
if (display == NULL) return;
-@@ -1529,12 +1529,12 @@
+@@ -1529,12 +1529,12 @@ void
for ( i = 0; i < MAXCOL; i++ ) {
if( colors[i].defined == 1 ) {
colors[i].defined = 0;
@@ -151,7 +156,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
#endif
display = NULL;
cws = NULL;
-@@ -1567,7 +1567,7 @@
+@@ -1567,7 +1567,7 @@ void
XFlush( display );
@@ -160,7 +165,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
for( wid = 0; wid < MAXWN; wid++ )
if( windows[wid].open ) {
-@@ -1886,7 +1886,7 @@
+@@ -1886,7 +1886,7 @@ int *wid;
int i;
tws = &windows[*wid];
@@ -169,7 +174,7 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
for( i = 0; i < MAXGC; i++ )
XSetClipMask( display, gclist[i], None );
-@@ -1916,9 +1916,9 @@
+@@ -1916,9 +1916,9 @@ float *r, *g, *b;
xcol.flags = DoRed || DoGreen || DoBlue;
if( colors[*cindex].defined == 1 ) {
colors[*cindex].defined = 0;
@@ -181,10 +186,11 @@ diff -urNad cernlib-2005.dfsg~/src/graflib/higz/higzcc/x11int.c cernlib-2005.dfs
colors[*cindex].defined = 1;
colors[*cindex].pixel = xcol.pixel;
colors[*cindex].red = *r;
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/log.c 2003-09-02 08:47:16.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/log.c 2006-09-06 19:53:39.378156868 -0400
-@@ -28,6 +28,7 @@
+diff --git a/src/packlib/cspack/sysreq/log.c b/src/packlib/cspack/sysreq/log.c
+index e7bc025..2dac5d2 100644
+--- a/src/packlib/cspack/sysreq/log.c
++++ b/src/packlib/cspack/sysreq/log.c
+@@ -31,6 +31,7 @@ Hemmer";
#include <stdio.h> /* standard input/output definitions */
#if !defined(vms)
#include <fcntl.h> /* file control */
@@ -192,10 +198,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.dfsg
#else
#include <stdlib.h> /* general utility definitions */
#include <unixio.h> /* VMS's unix-emulation I/O */
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c 1996-03-08 10:44:25.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c 2006-09-06 19:53:39.379156655 -0400
-@@ -25,6 +25,7 @@
+diff --git a/src/packlib/cspack/sysreq/netreq.c b/src/packlib/cspack/sysreq/netreq.c
+index 0d0e06e..29aa17e 100644
+--- a/src/packlib/cspack/sysreq/netreq.c
++++ b/src/packlib/cspack/sysreq/netreq.c
+@@ -25,6 +25,7 @@ static char sccsid[] = "@(#)netreq.c 1.18 10/14/94 CERN CN-PDP/CS F. Hemmer";
#include <netinet/in.h> /* Internet data types */
#include <arpa/inet.h> /* Arpa internet routines */
#include <stdio.h> /* Standard Input/Output */
@@ -203,10 +210,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.d
#if defined(vms)
#include <pwd_vms.h>
#else
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/serror.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/serror.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/serror.c 1998-08-25 08:44:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/serror.c 2006-09-06 19:53:39.379156655 -0400
-@@ -177,7 +177,7 @@
+diff --git a/src/packlib/cspack/sysreq/serror.c b/src/packlib/cspack/sysreq/serror.c
+index 3667c42..0df67f0 100644
+--- a/src/packlib/cspack/sysreq/serror.c
++++ b/src/packlib/cspack/sysreq/serror.c
+@@ -177,7 +177,7 @@ int n;
else {
#if !defined(vms)
if ((n>0) && (n<sys_nerr)) {
@@ -215,10 +223,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/serror.c cernlib-2005.d
}
else {
(void) sprintf(buf,"%s: %d\n",
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/socket.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/socket.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/socket.c 1998-08-25 08:44:55.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/socket.c 2006-09-06 19:53:39.379156655 -0400
-@@ -144,7 +144,10 @@
+diff --git a/src/packlib/cspack/sysreq/socket.c b/src/packlib/cspack/sysreq/socket.c
+index ceb5bd6..ff9c01d 100644
+--- a/src/packlib/cspack/sysreq/socket.c
++++ b/src/packlib/cspack/sysreq/socket.c
+@@ -144,7 +144,10 @@ static int rtimeout=READTIMEOUTVALUE;
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
@@ -229,7 +238,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/socket.c cernlib-2005.d
#if defined(vms)
#if defined(TWG) && (TWG == 1)
-@@ -412,7 +415,7 @@
+@@ -412,7 +415,7 @@ char *
s_errmsg() /* return last error message */
{
#if !defined(vms)
@@ -238,10 +247,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/socket.c cernlib-2005.d
#else /* vms */
#if defined(MULTINET) && (MULTINET == 1)
return(vms_errno_string());
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/sysreq.h cernlib-2005.dfsg/src/packlib/cspack/sysreq/sysreq.h
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/sysreq.h 1996-03-08 10:44:26.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/sysreq.h 2006-09-06 19:53:39.380156442 -0400
-@@ -88,7 +88,7 @@
+diff --git a/src/packlib/cspack/sysreq/sysreq.h b/src/packlib/cspack/sysreq/sysreq.h
+index b501e3f..661a829 100644
+--- a/src/packlib/cspack/sysreq/sysreq.h
++++ b/src/packlib/cspack/sysreq/sysreq.h
+@@ -88,7 +88,7 @@ typedef struct { /* SYSREQ reply header */
*/
#ifndef VM
@@ -250,10 +260,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/sysreq.h cernlib-2005.d
#endif /* VM */
extern char *getenv(); /* Get environment info */
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/xdr.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/xdr.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/xdr.c 1996-03-08 10:44:26.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/xdr.c 2006-09-06 19:53:39.380156442 -0400
-@@ -52,7 +52,7 @@
+diff --git a/src/packlib/cspack/sysreq/xdr.c b/src/packlib/cspack/sysreq/xdr.c
+index f22ef78..742943f 100644
+--- a/src/packlib/cspack/sysreq/xdr.c
++++ b/src/packlib/cspack/sysreq/xdr.c
+@@ -52,7 +52,7 @@ Hemmer";
#endif /* min */
#ifndef VM
@@ -262,10 +273,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/xdr.c cernlib-2005.dfsg
#endif /* VM */
#ifdef VM
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/Imakefile cernlib-2005.dfsg/src/packlib/cspack/tcpaw/Imakefile
---- cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/Imakefile 1999-01-15 08:59:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/tcpaw/Imakefile 2006-09-06 19:53:39.380156442 -0400
-@@ -49,4 +49,9 @@
+diff --git a/src/packlib/cspack/tcpaw/Imakefile b/src/packlib/cspack/tcpaw/Imakefile
+index 2a52b5c..5b519d4 100644
+--- a/src/packlib/cspack/tcpaw/Imakefile
++++ b/src/packlib/cspack/tcpaw/Imakefile
+@@ -49,4 +49,9 @@ DEFINES:= $(DEFINES) -DDECC
#endif
#endif
@@ -275,10 +287,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/Imakefile cernlib-2005.d
+#endif
+
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c 2005-04-18 11:39:28.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/tcpaw/tcpaw.c 2006-09-06 19:53:53.133231056 -0400
-@@ -301,6 +301,7 @@
+diff --git a/src/packlib/cspack/tcpaw/tcpaw.c b/src/packlib/cspack/tcpaw/tcpaw.c
+index 579fc75..5b835d6 100644
+--- a/src/packlib/cspack/tcpaw/tcpaw.c
++++ b/src/packlib/cspack/tcpaw/tcpaw.c
+@@ -307,6 +307,7 @@
#ifndef IBMRT
/* this is a kludge, one ought to fix the "prototypes" in this file */
#include <string.h>
@@ -286,7 +299,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#endif /* IBMRT */
#endif /* WIN32 */
#endif /* IBM */
-@@ -478,7 +479,7 @@
+@@ -487,7 +488,7 @@ int *out;
#endif /* VMS */
#ifdef AUTHENT
@@ -295,7 +308,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
char usbuf[20], pwbuf[20];
char *user = usbuf, *passwd = pwbuf;
register int i, len;
-@@ -487,7 +488,7 @@
+@@ -496,7 +497,7 @@ int *out;
#ifdef SOCKETS
struct hostent *hp; /* host info for remote host */
struct sockaddr_in peeraddr_in; /* for peer socket address */
@@ -304,7 +317,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#endif /* SOCKETS */
#ifdef WIN32
-@@ -521,7 +522,7 @@
+@@ -530,7 +531,7 @@ int *out;
#ifdef SOCKETS
memset ((char *)&peeraddr_in, 0, sizeof(struct sockaddr_in));
peerlen = sizeof(peeraddr_in);
@@ -313,7 +326,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#ifdef LOGFILE
fprintf(logfile, "%s: getpeername failed\n", Prog_Name);
#endif /* LOGFILE */
-@@ -658,7 +659,7 @@
+@@ -667,7 +668,7 @@ int ssetup(isock, osock) /* OS9 */
SOCKET *isock, *osock;
{
#ifdef AUTHENT
@@ -322,7 +335,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
char usbuf[20], pwbuf[20];
char *user = usbuf, *passwd = pwbuf;
register int i, len;
-@@ -727,7 +728,7 @@
+@@ -736,7 +737,7 @@ int *port; /* VM */
unsigned short sport = *port; /* VM */
#if defined ( _WIN32) && defined (AUTHENT)
@@ -331,7 +344,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
char usbuf[20], pwbuf[20];
char *user = usbuf, *passwd = pwbuf;
register int i, len;
-@@ -800,7 +801,7 @@
+@@ -809,7 +810,7 @@ int *port; /* VM */
}
#endif
/* Bind the listen address to the socket. */
@@ -340,7 +353,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#if defined(IBM) || defined(_WIN32)
tcperror("server_sock_setup: bind(ls,...)");
#else
-@@ -829,7 +830,7 @@
+@@ -838,7 +839,7 @@ int *port; /* VM */
exit(1);
}
addrlen = sizeof(struct sockaddr_in);
@@ -349,7 +362,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
if ( s == INVALID_SOCKET) {
fprintf(stderr, "%s: accept error\n", "server_sock_setup");
return(-1);
-@@ -984,7 +985,7 @@
+@@ -993,7 +994,7 @@ char *srvc;
char *user = NULL, *passwd = NULL;
int port;
#if defined(AUTHENT)
@@ -358,7 +371,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#endif /* AUTHENT */
#ifdef VMS
-@@ -1290,7 +1291,7 @@
+@@ -1299,7 +1300,7 @@ vmagain:
/* Try to connect to the remote server at the address
* which was just built into peeraddr.
*/
@@ -367,7 +380,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#ifndef _WIN32
close(s);
#else
-@@ -1313,7 +1314,7 @@
+@@ -1322,7 +1323,7 @@ vmagain:
}
addrlen = sizeof(struct sockaddr_in);
@@ -376,7 +389,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#if defined(IBM) || defined(_WIN32)
tcperror("client_sock_setup");
#else
-@@ -2688,7 +2689,7 @@
+@@ -2714,7 +2715,7 @@ retry:
((struct in_addr *)(hp->h_addr))->s_addr;
/* bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length); */
}
@@ -385,7 +398,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#ifndef _WIN32
if (errno == ECONNREFUSED && timo <= 16) {
(void) close(s);
-@@ -3352,7 +3353,7 @@
+@@ -3378,7 +3379,7 @@ retry:
((struct in_addr *)(hp->h_addr))->s_addr;
/* bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length); */
}
@@ -394,7 +407,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
#ifndef WIN32
if (errno == ECONNREFUSED && timo <= 16) {
(void) close(s);
-@@ -3486,7 +3487,7 @@
+@@ -3512,7 +3513,7 @@ bad:
}
getstr(sock,buf, cnt, errmesg)
@@ -403,9 +416,10 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.dfs
char *buf;
int cnt; /* sizeof() the char array */
char *errmesg; /* in case error message required */
-diff -urNad cernlib-2005.dfsg~/src/packlib/fatmen/fmc/faexit.c cernlib-2005.dfsg/src/packlib/fatmen/fmc/faexit.c
---- cernlib-2005.dfsg~/src/packlib/fatmen/fmc/faexit.c 1997-09-02 08:56:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/fatmen/fmc/faexit.c 2006-09-06 19:53:39.381156230 -0400
+diff --git a/src/packlib/fatmen/fmc/faexit.c b/src/packlib/fatmen/fmc/faexit.c
+index f65be80..cfaf808 100644
+--- a/src/packlib/fatmen/fmc/faexit.c
++++ b/src/packlib/fatmen/fmc/faexit.c
@@ -27,6 +27,7 @@
void faexit(icode)
#endif
@@ -414,9 +428,32 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/fatmen/fmc/faexit.c cernlib-2005.dfsg
void faexit_(icode)
#endif
int *icode;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/abend.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/abend.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/abend.c 1997-02-04 12:34:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/abend.c 2006-09-06 19:53:39.382156017 -0400
+diff --git a/src/packlib/kernlib/kernbit/z268/systems.c b/src/packlib/kernlib/kernbit/z268/systems.c
+index 9845945..24af735 100644
+--- a/src/packlib/kernlib/kernbit/z268/systems.c
++++ b/src/packlib/kernlib/kernbit/z268/systems.c
+@@ -134,7 +134,7 @@ int *ovflw;
+ #endif /* hpux */
+
+ if ( (ps=(FILE *)popen(command,"r"))==NULL ) {
+- fprintf(stderr,"systems(): popen(): %s\n",sys_errlist[errno] );
++ fprintf(stderr,"systems(): popen(): %s\n",strerror(errno));
+ *rc= -errno;
+ *chars=0 ;
+ *l=0 ;
+@@ -144,7 +144,7 @@ int *ovflw;
+ rcode = fread(buf, 1, buflen , ps );
+ if ( rcode < 0 ) {
+ fprintf(stderr,"systems(): pipe fread(): %s\n",
+- sys_errlist[errno] );
++ strerror(errno));
+ buf[0]='\n';
+ *rc= -errno;
+ *chars=0 ;
+diff --git a/src/packlib/kernlib/kerngen/ccgen/abend.c b/src/packlib/kernlib/kerngen/ccgen/abend.c
+index ef20498..80b1145 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/abend.c
++++ b/src/packlib/kernlib/kerngen/ccgen/abend.c
@@ -19,6 +19,7 @@
CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111
*/
@@ -425,9 +462,34 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/abend.c cernlib
void type_of_call abend_()
#endif
#if defined(CERNLIB_QXNO_SC)
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/ctimef.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/ctimef.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/ctimef.c 1997-02-04 12:34:14.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/ctimef.c 2006-09-06 19:53:39.382156017 -0400
+diff --git a/src/packlib/kernlib/kerngen/ccgen/accesi.c b/src/packlib/kernlib/kerngen/ccgen/accesi.c
+index 38c0b9e..52f4484 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/accesi.c
++++ b/src/packlib/kernlib/kerngen/ccgen/accesi.c
+@@ -40,6 +40,7 @@
+ file can be searched and the file exists.
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ int type_of_call accesi_(fname, mode, lgname)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/chdiri.c b/src/packlib/kernlib/kerngen/ccgen/chdiri.c
+index 0934113..293ab21 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/chdiri.c
++++ b/src/packlib/kernlib/kerngen/ccgen/chdiri.c
+@@ -29,6 +29,7 @@
+ ISTAT returns zero if successful
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifdef WIN32
+ #include <direct.h>
+ # ifndef chdir
+diff --git a/src/packlib/kernlib/kerngen/ccgen/ctimef.c b/src/packlib/kernlib/kerngen/ccgen/ctimef.c
+index da36e10..3d3ffc8 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/ctimef.c
++++ b/src/packlib/kernlib/kerngen/ccgen/ctimef.c
@@ -24,6 +24,8 @@
STIME decoded time string of length 24 (CHARACTER*24 STIME)
*/
@@ -437,9 +499,10 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/ctimef.c cernli
void type_of_call ctimef_(clock, stime)
#endif
#if defined(CERNLIB_QXNO_SC)
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/exitf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/exitf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/exitf.c 1997-02-04 12:34:16.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/exitf.c 2006-09-06 19:53:39.382156017 -0400
+diff --git a/src/packlib/kernlib/kerngen/ccgen/exitf.c b/src/packlib/kernlib/kerngen/ccgen/exitf.c
+index 32a2545..53537bb 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/exitf.c
++++ b/src/packlib/kernlib/kerngen/ccgen/exitf.c
@@ -19,6 +19,7 @@
CERN PROGLIB# Z035 EXITF .VERSION KERNFOR 4.39 940228
*/
@@ -448,9 +511,22 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/exitf.c cernlib
void type_of_call exitf_(st)
#endif
#if defined(CERNLIB_QXNO_SC)
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/getwdi.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/getwdi.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/getwdi.c 1997-09-02 10:26:36.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/getwdi.c 2006-09-06 19:53:39.382156017 -0400
+diff --git a/src/packlib/kernlib/kerngen/ccgen/geteni.c b/src/packlib/kernlib/kerngen/ccgen/geteni.c
+index 3bc009e..956f250 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/geteni.c
++++ b/src/packlib/kernlib/kerngen/ccgen/geteni.c
+@@ -30,6 +30,7 @@
+ ISLATE(1) returns its length
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ void type_of_call geteni_(fname, ftext, lgtext, lgname)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/getwdi.c b/src/packlib/kernlib/kerngen/ccgen/getwdi.c
+index f2d3934..e295558 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/getwdi.c
++++ b/src/packlib/kernlib/kerngen/ccgen/getwdi.c
@@ -29,6 +29,7 @@
ISLATE(1) returns its lenth NTEXT
*/
@@ -459,7 +535,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/getwdi.c cernli
#ifdef WIN32
#include <direct.h>
# ifndef getcwd
-@@ -58,7 +59,7 @@
+@@ -58,7 +59,7 @@ void type_of_call getwdi(fname, lgname)
#endif
int *lgname;
{
@@ -468,10 +544,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/getwdi.c cernli
char *ptalc, *pttext;
int fchput();
int nalc;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lstati.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lstati.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lstati.c 1997-02-04 12:34:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lstati.c 2006-09-06 19:53:39.382156017 -0400
-@@ -26,6 +26,7 @@
+diff --git a/src/packlib/kernlib/kerngen/ccgen/lstati.c b/src/packlib/kernlib/kerngen/ccgen/lstati.c
+index af48dce..47b1f60 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/lstati.c
++++ b/src/packlib/kernlib/kerngen/ccgen/lstati.c
+@@ -26,6 +26,7 @@ C ORIG. 24/03/91, RDM + JZ
Fortran interface routine to lstat
*/
#include <stdio.h>
@@ -479,7 +556,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lstati.c cernli
#include <sys/types.h>
#include <sys/stat.h>
#include "kerngen/fortchar.h"
-@@ -56,7 +57,7 @@
+@@ -56,7 +57,7 @@ int LSTATI(fname, info, lgname, slate)
ptname = fchtak(fname,*lgname);
if (ptname == NULL) goto out1;
@@ -488,10 +565,59 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lstati.c cernli
if (buf == NULL) goto out2;
istat = lstat(ptname, buf);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/sigprnt.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/sigprnt.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/sigprnt.c 1997-02-04 12:34:42.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/sigprnt.c 2006-09-06 19:53:39.383155804 -0400
-@@ -34,7 +34,7 @@
+diff --git a/src/packlib/kernlib/kerngen/ccgen/perroi.c b/src/packlib/kernlib/kerngen/ccgen/perroi.c
+index 38563e3..f656da9 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/perroi.c
++++ b/src/packlib/kernlib/kerngen/ccgen/perroi.c
+@@ -28,6 +28,7 @@
+ TEXT the text to be printed before the error message
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ void type_of_call perroi_(ftext, lgtext)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/readlni.c b/src/packlib/kernlib/kerngen/ccgen/readlni.c
+index 2fec638..5d7d776 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/readlni.c
++++ b/src/packlib/kernlib/kerngen/ccgen/readlni.c
+@@ -27,6 +27,7 @@
+ NCH returns the length of the value
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ int type_of_call readlni_(fname, ftext, lgtext, lgname)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/renami.c b/src/packlib/kernlib/kerngen/ccgen/renami.c
+index 9447854..59bb1e1 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/renami.c
++++ b/src/packlib/kernlib/kerngen/ccgen/renami.c
+@@ -27,6 +27,7 @@
+ ISTAT zero if successful
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ int type_of_call renami_(frpath, topath, lgfr, lgto)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/setenvsy5.c b/src/packlib/kernlib/kerngen/ccgen/setenvsy5.c
+index 5a740b6..fc00519 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/setenvsy5.c
++++ b/src/packlib/kernlib/kerngen/ccgen/setenvsy5.c
+@@ -23,6 +23,7 @@
+ TEXT the value to be assigned
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #include "kerngen/fortranc.h"
+
+diff --git a/src/packlib/kernlib/kerngen/ccgen/sigprnt.c b/src/packlib/kernlib/kerngen/ccgen/sigprnt.c
+index 67e4c1a..12c7ff2 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/sigprnt.c
++++ b/src/packlib/kernlib/kerngen/ccgen/sigprnt.c
+@@ -34,7 +34,7 @@ void type_of_call SIGPRNT()
#ifndef CERNLIB_WINNT
sigset_t oldmask;
@@ -500,10 +626,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/sigprnt.c cernl
printf (" blocked signals are: %x\n", oldmask);
#else
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/stati.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/stati.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/stati.c 1997-09-02 10:26:39.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/stati.c 2006-09-06 19:53:39.383155804 -0400
-@@ -26,6 +26,7 @@
+diff --git a/src/packlib/kernlib/kerngen/ccgen/stati.c b/src/packlib/kernlib/kerngen/ccgen/stati.c
+index 4595bd6..87ed227 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/stati.c
++++ b/src/packlib/kernlib/kerngen/ccgen/stati.c
+@@ -26,6 +26,7 @@ C ORIG. 14/03/91, RDM
Fortran interface routine to stat
*/
#include <stdio.h>
@@ -511,7 +638,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/stati.c cernlib
#if defined(CERNLIB_QMVAX)||defined(CERNLIB_QMOS9)
#include <types.h>
#include <stat.h>
-@@ -72,7 +73,7 @@
+@@ -72,7 +73,7 @@ int type_of_call stati(fname, info, lgname)
if (ptname == NULL) goto out1;
#ifndef WIN32
@@ -520,9 +647,22 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/stati.c cernlib
#else
buf = (struct _stat *) malloc(sizeof (struct _stat));
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/timel.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/timel.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/timel.c 1997-02-04 12:34:47.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/timel.c 2006-09-06 19:53:39.383155804 -0400
+diff --git a/src/packlib/kernlib/kerngen/ccgen/systei.c b/src/packlib/kernlib/kerngen/ccgen/systei.c
+index 7498487..6ee89e9 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/systei.c
++++ b/src/packlib/kernlib/kerngen/ccgen/systei.c
+@@ -29,6 +29,7 @@
+ ISTAT returns zero if successful
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+
+ #if defined(CERNLIB_QX_SC)
+diff --git a/src/packlib/kernlib/kerngen/ccgen/timel.c b/src/packlib/kernlib/kerngen/ccgen/timel.c
+index 6e7085a..79e2276 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/timel.c
++++ b/src/packlib/kernlib/kerngen/ccgen/timel.c
@@ -30,6 +30,7 @@
#include <sys/param.h>
#include <sys/time.h>
@@ -531,9 +671,49 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/timel.c cernlib
#ifndef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC CLK_TCK
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgenu/fchtak.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgenu/fchtak.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgenu/fchtak.c 1996-02-15 12:49:40.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgenu/fchtak.c 2006-09-06 19:53:39.383155804 -0400
+diff --git a/src/packlib/kernlib/kerngen/ccgen/unlini.c b/src/packlib/kernlib/kerngen/ccgen/unlini.c
+index f7b187d..45de871 100644
+--- a/src/packlib/kernlib/kerngen/ccgen/unlini.c
++++ b/src/packlib/kernlib/kerngen/ccgen/unlini.c
+@@ -29,6 +29,7 @@
+ ISTAT returns zero if successful
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "kerngen/fortchar.h"
+ #if defined(CERNLIB_QX_SC)
+ int type_of_call unlini_(fname,lgname)
+diff --git a/src/packlib/kernlib/kerngen/ccgencf/cfopei.c b/src/packlib/kernlib/kerngen/ccgencf/cfopei.c
+index e554034..f718d91 100644
+--- a/src/packlib/kernlib/kerngen/ccgencf/cfopei.c
++++ b/src/packlib/kernlib/kerngen/ccgencf/cfopei.c
+@@ -45,6 +45,7 @@
+ */
+ #include "kerngen/cf_open.h"
+ #include <errno.h>
++#include <stdlib.h>
+ #include "kerngen/cf_xaft.h"
+ #include "kerngen/fortchar.h"
+ #include "kerngen/wordsizc.h"
+diff --git a/src/packlib/kernlib/kerngen/ccgenci/ciopei.c b/src/packlib/kernlib/kerngen/ccgenci/ciopei.c
+index 9729f30..ef7ff72 100644
+--- a/src/packlib/kernlib/kerngen/ccgenci/ciopei.c
++++ b/src/packlib/kernlib/kerngen/ccgenci/ciopei.c
+@@ -38,9 +38,8 @@
+ #include "kerngen/cf_open.h"
+ #ifndef WIN32
+ # include <errno.h>
+-#else
+-# include <stdlib.h>
+ #endif
++#include <stdlib.h>
+ #include "kerngen/cf_xaft.h"
+ #include "kerngen/fortchar.h"
+ int ciopen_perm = 0;
+diff --git a/src/packlib/kernlib/kerngen/ccgenu/fchtak.c b/src/packlib/kernlib/kerngen/ccgenu/fchtak.c
+index bdb1af8..f9dc666 100644
+--- a/src/packlib/kernlib/kerngen/ccgenu/fchtak.c
++++ b/src/packlib/kernlib/kerngen/ccgenu/fchtak.c
@@ -16,6 +16,7 @@
return the memory pointer
*/
@@ -542,7 +722,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgenu/fchtak.c cernl
#include "kerngen/fortchar.h"
char *fchtak(ftext,lgtext)
#if defined(CERNLIB_QMCRY)
-@@ -26,7 +27,7 @@
+@@ -26,7 +27,7 @@ char *fchtak(ftext,lgtext)
#endif
int lgtext;
{
@@ -551,10 +731,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgenu/fchtak.c cernl
char *ptalc, *ptuse;
char *utext;
int nalc;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/getline.c cernlib-2005.dfsg/src/packlib/kuip/code_kuip/getline.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/getline.c 1998-08-25 08:47:32.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_kuip/getline.c 2006-09-06 19:53:39.384155592 -0400
-@@ -585,7 +585,7 @@
+diff --git a/src/packlib/kuip/code_kuip/getline.c b/src/packlib/kuip/code_kuip/getline.c
+index 8bc4d73..cb07af0 100644
+--- a/src/packlib/kuip/code_kuip/getline.c
++++ b/src/packlib/kuip/code_kuip/getline.c
+@@ -585,7 +585,7 @@ int c;
static void
gl_puts(buf)
@@ -563,7 +744,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/getline.c cernlib-2005
{
/*
int len = strlen(buf);
-@@ -1351,7 +1351,7 @@
+@@ -1351,7 +1351,7 @@ static char *
static char *
hist_save(p)
@@ -572,10 +753,11 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/getline.c cernlib-2005
/* makes a copy of the string */
{
char *s;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/iconwidget.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/iconwidget.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/iconwidget.c 1996-03-08 10:33:10.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/iconwidget.c 2006-09-06 19:53:39.384155592 -0400
-@@ -284,7 +284,7 @@
+diff --git a/src/packlib/kuip/code_motif/iconwidget.c b/src/packlib/kuip/code_motif/iconwidget.c
+index f454574..be0c44e 100644
+--- a/src/packlib/kuip/code_motif/iconwidget.c
++++ b/src/packlib/kuip/code_motif/iconwidget.c
+@@ -289,7 +289,7 @@ static void DrawShadow (iw, really)
Boolean in = (iw->icon.armed && really) ||
iw->icon.shadow_type == XmSHADOW_IN;
@@ -584,7 +766,7 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/iconwidget.c cernlib-
_XmDrawShadow (XtDisplay (iw), XtWindow (iw),
in ? iw->primitive.bottom_shadow_GC :
iw->primitive.top_shadow_GC,
-@@ -372,7 +372,7 @@
+@@ -377,7 +377,7 @@ static void Enter (iw, event)
#endif
if (iw->icon.armed)
@@ -593,3 +775,14 @@ diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/iconwidget.c cernlib-
}
/************************************************************************
+diff --git a/src/packlib/zebra/test/fqtest/fqnameda.inc b/src/packlib/zebra/test/fqtest/fqnameda.inc
+index 022da36..66b6b9c 100644
+--- a/src/packlib/zebra/test/fqtest/fqnameda.inc
++++ b/src/packlib/zebra/test/fqtest/fqnameda.inc
+@@ -17,5 +17,5 @@
+ #elif defined(CERNLIB_QMIBMD)
+ DATA FQNAME / '/ZXTEST DAT1', '/ZXTEST DAT2', '/ZXTEST DAT3' /
+ #elif 1
+- DATA FQNAME / 'zxtest1.dat ', 'zxtest2.dat ', 'zxtest3.dat ' /
++ DATA FQNAME / 'zxtest1.dat ', 'zxtest2.dat ', 'zxtest3.dat ' /
+ #endif
--
CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences
More information about the debian-science-commits
mailing list