[SCM] PAW: Physics Analysis Workstation branch, debian-patch/2.14.04.dfsg.2-7, updated. upstream/2.14.04.dfsg.2-15-g9f871b3
Lifeng Sun
lifongsun at gmail.com
Tue Mar 22 09:10:52 UTC 2011
The following commit has been merged in the debian-patch/2.14.04.dfsg.2-7 branch:
commit 9f871b37d9dd0c9fa4b8b3105c0a081efd887db3
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Mar 22 15:54:33 2011 +0800
Update patch 211.
Eliminate warning on incompatible pointers, feel free to call HBALLOC64
and HGNTBF64 on 32-bit architectures.
diff --git a/debian/patches/211-support-amd64-and-itanium.dpatch b/debian/patches/211-support-amd64-and-itanium.dpatch
index 7488b4d..792d497 100755
--- a/debian/patches/211-support-amd64-and-itanium.dpatch
+++ b/debian/patches/211-support-amd64-and-itanium.dpatch
@@ -1,18 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 211-support-amd64-and-itanium.dpatch by <kmccarty at debian.org>
+## 211-support-amd64-and-itanium.dpatch by <kmccarty at debian.org> and <lifongsun at gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt <hvogt at ifh.de> to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
-## DP: when dynamically linked on 64-bit anyway. Last revision 2006-07-20.
+## DP: when dynamically linked on 64-bit anyway. Last revision 2011-03-22.
@DPATCH@
-diff -urNad paw-2.14.04~/src/cfortran/hbook.h paw-2.14.04/src/cfortran/hbook.h
---- paw-2.14.04~/src/cfortran/hbook.h 1999-11-15 12:01:12.000000000 -0500
-+++ paw-2.14.04/src/cfortran/hbook.h 2006-09-08 14:44:11.806264586 -0400
-@@ -489,6 +489,10 @@
+diff --git a/src/cfortran/hbook.h b/src/cfortran/hbook.h
+index 0db42dd..ca855d6 100644
+--- a/src/cfortran/hbook.h
++++ b/src/cfortran/hbook.h
+@@ -489,6 +489,10 @@ PROTOCCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,
#define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
@@ -23,7 +24,7 @@ diff -urNad paw-2.14.04~/src/cfortran/hbook.h paw-2.14.04/src/cfortran/hbook.h
PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
#define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
-@@ -508,6 +512,13 @@
+@@ -508,6 +512,13 @@ PROTOCCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT)
#define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
@@ -37,10 +38,11 @@ diff -urNad paw-2.14.04~/src/cfortran/hbook.h paw-2.14.04/src/cfortran/hbook.h
PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
#define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/Imakefile paw-2.14.04/src/pawlib/comis/code/Imakefile
---- paw-2.14.04~/src/pawlib/comis/code/Imakefile 2006-09-08 14:44:11.387353882 -0400
-+++ paw-2.14.04/src/pawlib/comis/code/Imakefile 2006-09-08 14:44:11.806264586 -0400
-@@ -50,6 +50,10 @@
+diff --git a/src/pawlib/comis/code/Imakefile b/src/pawlib/comis/code/Imakefile
+index 82f2d55..f8a5f4c 100644
+--- a/src/pawlib/comis/code/Imakefile
++++ b/src/pawlib/comis/code/Imakefile
+@@ -50,6 +50,10 @@ SRCS_F := $(SRCS_F) cssinp.F
SRCS_F := $(SRCS_F) cscrexec.F
#endif
@@ -51,9 +53,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/Imakefile paw-2.14.04/src/pawlib/
#if defined(CERNLIB_OLD)
SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
#endif
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csaddr.F paw-2.14.04/src/pawlib/comis/code/csaddr.F
---- paw-2.14.04~/src/pawlib/comis/code/csaddr.F 1996-02-26 12:16:25.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/csaddr.F 2006-09-08 14:44:11.806264586 -0400
+diff --git a/src/pawlib/comis/code/csaddr.F b/src/pawlib/comis/code/csaddr.F
+index 2808414..96b6cb0 100644
+--- a/src/pawlib/comis/code/csaddr.F
++++ b/src/pawlib/comis/code/csaddr.F
@@ -17,8 +17,15 @@
INTEGER CSLTGP,CSITGP
CHARACTER*32 NAME
@@ -111,9 +114,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/csaddr.F paw-2.14.04/src/pawlib/c
END IF
CSADDR=I
#endif
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/comis/code/csinit.F
---- paw-2.14.04~/src/pawlib/comis/code/csinit.F 2005-04-18 11:41:04.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/code/csinit.F 2006-09-08 14:44:11.807264373 -0400
+diff --git a/src/pawlib/comis/code/csinit.F b/src/pawlib/comis/code/csinit.F
+index 374621d..24003d8 100644
+--- a/src/pawlib/comis/code/csinit.F
++++ b/src/pawlib/comis/code/csinit.F
@@ -64,6 +64,9 @@
#if defined(CERNLIB_SHL)
#include "comis/cshlnm.inc"
@@ -145,9 +149,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/c
#endif
#if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
ITMPLEN=CSTMPD(CHPATH, 256)
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csintx.F paw-2.14.04/src/pawlib/comis/code/csintx.F
---- paw-2.14.04~/src/pawlib/comis/code/csintx.F 1996-12-05 04:50:37.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/csintx.F 2006-09-08 14:44:11.807264373 -0400
+diff --git a/src/pawlib/comis/code/csintx.F b/src/pawlib/comis/code/csintx.F
+index 19be1f7..8e08617 100644
+--- a/src/pawlib/comis/code/csintx.F
++++ b/src/pawlib/comis/code/csintx.F
@@ -38,6 +38,9 @@
#if defined(CERNLIB_PAW)
#include "comis/cskucs.inc"
@@ -190,9 +195,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/csintx.F paw-2.14.04/src/pawlib/c
IPC=IPC+4
GO TO 999
*NUM I
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csitgpl.F paw-2.14.04/src/pawlib/comis/code/csitgpl.F
---- paw-2.14.04~/src/pawlib/comis/code/csitgpl.F 1969-12-31 19:00:00.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/csitgpl.F 2006-09-08 14:44:11.808264160 -0400
+diff --git a/src/pawlib/comis/code/csitgpl.F b/src/pawlib/comis/code/csitgpl.F
+new file mode 100644
+index 0000000..00c88ef
+--- /dev/null
++++ b/src/pawlib/comis/code/csitgpl.F
@@ -0,0 +1,32 @@
+* COMIS
+*
@@ -226,9 +233,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/csitgpl.F paw-2.14.04/src/pawlib/
+ CSITGPL=I
+ END
+#endif
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/cskcal.F paw-2.14.04/src/pawlib/comis/code/cskcal.F
---- paw-2.14.04~/src/pawlib/comis/code/cskcal.F 1996-12-05 04:50:39.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/cskcal.F 2006-09-08 14:44:11.808264160 -0400
+diff --git a/src/pawlib/comis/code/cskcal.F b/src/pawlib/comis/code/cskcal.F
+index 724c951..cbefaac 100644
+--- a/src/pawlib/comis/code/cskcal.F
++++ b/src/pawlib/comis/code/cskcal.F
@@ -31,6 +31,9 @@
#include "comis/cstab.inc"
#include "comis/csfres.inc"
@@ -272,9 +280,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cskcal.F paw-2.14.04/src/pawlib/c
#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
I=1
DO 9203 K=ITA-NPAR+1,ITA
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/cslink.F paw-2.14.04/src/pawlib/comis/code/cslink.F
---- paw-2.14.04~/src/pawlib/comis/code/cslink.F 1996-02-26 12:16:17.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/cslink.F 2006-09-08 14:44:11.808264160 -0400
+diff --git a/src/pawlib/comis/code/cslink.F b/src/pawlib/comis/code/cslink.F
+index d7313c6..3760b82 100644
+--- a/src/pawlib/comis/code/cslink.F
++++ b/src/pawlib/comis/code/cslink.F
@@ -21,10 +21,15 @@
#include "comis/cstab.inc"
#include "comis/cspnts.inc"
@@ -313,9 +322,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cslink.F paw-2.14.04/src/pawlib/c
IP=0
ENDIF
ENDIF
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/cspawi.F paw-2.14.04/src/pawlib/comis/code/cspawi.F
---- paw-2.14.04~/src/pawlib/comis/code/cspawi.F 1996-02-26 12:16:22.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/cspawi.F 2006-09-08 14:44:11.808264160 -0400
+diff --git a/src/pawlib/comis/code/cspawi.F b/src/pawlib/comis/code/cspawi.F
+index 8c4283a..fba1624 100644
+--- a/src/pawlib/comis/code/cspawi.F
++++ b/src/pawlib/comis/code/cspawi.F
@@ -23,10 +23,12 @@
COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,HCV(9989)
DIMENSION IQ(2),Q(2),LQ(8000)
@@ -330,9 +340,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cspawi.F paw-2.14.04/src/pawlib/c
NCIDEN=6
NWIDEN=2
I=CSLTGB(IPVS)
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F paw-2.14.04/src/pawlib/comis/code/csrtgpl.F
---- paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F 1969-12-31 19:00:00.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/csrtgpl.F 2006-09-08 14:44:11.808264160 -0400
+diff --git a/src/pawlib/comis/code/csrtgpl.F b/src/pawlib/comis/code/csrtgpl.F
+new file mode 100644
+index 0000000..06f0708
+--- /dev/null
++++ b/src/pawlib/comis/code/csrtgpl.F
@@ -0,0 +1,31 @@
+* COMIS
+*
@@ -365,10 +377,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F paw-2.14.04/src/pawlib/
+ CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+ END
+#endif
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/cstran.F paw-2.14.04/src/pawlib/comis/code/cstran.F
---- paw-2.14.04~/src/pawlib/comis/code/cstran.F 2001-02-07 04:27:01.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/code/cstran.F 2006-09-08 14:44:11.810263734 -0400
-@@ -521,6 +521,7 @@
+diff --git a/src/pawlib/comis/code/cstran.F b/src/pawlib/comis/code/cstran.F
+index 4e91439..1388748 100644
+--- a/src/pawlib/comis/code/cstran.F
++++ b/src/pawlib/comis/code/cstran.F
+@@ -521,6 +521,7 @@ CD COMMON/CSDEBG/ICSTRA,ICSPRT,ICSPRC,ICSPRS
* '#' DRSJNT
* 'OD'/'FI'/'ENDDO'/'ENDIF'/'END' DELIM DRSJNT
****
@@ -376,7 +389,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cstran.F paw-2.14.04/src/pawlib/c
INTEGER GSCMST(3046),GSSTRC(135),GSSTRP(255)
INTEGER GSCMS1(361),GSCMS2(361),GSCMS3(361),GSCMS4(361),
*GSCMS5(361),GSCMS6(361),GSCMS7(361),GSCMS8(361),GSCMS9(158)
-@@ -719,6 +720,7 @@
+@@ -719,6 +720,7 @@ CD COMMON/CSDEBG/ICSTRA,ICSPRT,ICSPRC,ICSPRS
DATA IOST/0/
** DATA NHSSC/4H; /, NHSEQ/4H= /, NHSBR/4H) /
DATA NMPAWC/4HPAWC/
@@ -384,7 +397,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cstran.F paw-2.14.04/src/pawlib/c
CALL CCOPYA(IDEN,IDENPR,NWIDEN)
NCIDPR=NCIDEN
NWIDPR=NWIDEN
-@@ -903,7 +905,7 @@
+@@ -903,7 +905,7 @@ CD IF(ICSPRC.EQ.1)CALL PRCODE(IPCB,IPCE)
211 CONTINUE
#if defined(CERNLIB_PAW)
KEYWD=22
@@ -393,9 +406,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/code/cstran.F paw-2.14.04/src/pawlib/c
NCIDEN=6
NWIDEN=2
IGB=CSLTGB(IPVSB)
-diff -urNad paw-2.14.04~/src/pawlib/comis/comis/cstab64.inc paw-2.14.04/src/pawlib/comis/comis/cstab64.inc
---- paw-2.14.04~/src/pawlib/comis/comis/cstab64.inc 1969-12-31 19:00:00.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/comis/cstab64.inc 2006-09-08 14:44:11.810263734 -0400
+diff --git a/src/pawlib/comis/comis/cstab64.inc b/src/pawlib/comis/comis/cstab64.inc
+new file mode 100644
+index 0000000..b3176a8
+--- /dev/null
++++ b/src/pawlib/comis/comis/cstab64.inc
@@ -0,0 +1,10 @@
+*
+*
@@ -407,10 +422,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/comis/cstab64.inc paw-2.14.04/src/pawl
+ COMMON /CSTB64/ IADGPL,IADGPLV
+ COMMON /CSTB64I/ IPIADGV
+ EQUIVALENCE (IADGPL, IADGPL1)
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/ccopys.c paw-2.14.04/src/pawlib/comis/deccc/ccopys.c
---- paw-2.14.04~/src/pawlib/comis/deccc/ccopys.c 1997-09-02 11:50:38.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/deccc/ccopys.c 2006-09-08 14:44:11.810263734 -0400
-@@ -33,11 +33,42 @@
+diff --git a/src/pawlib/comis/deccc/ccopys.c b/src/pawlib/comis/deccc/ccopys.c
+index 024534c..94351dc 100644
+--- a/src/pawlib/comis/deccc/ccopys.c
++++ b/src/pawlib/comis/deccc/ccopys.c
+@@ -33,11 +33,42 @@ void type_of_call CCOPYS(ja, jb, nn)
#else
void ccopys_(ja,jb,nn)
#endif
@@ -454,9 +470,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/ccopys.c paw-2.14.04/src/pawlib/
if ( a >= b )
for ( i=0; i<n; i++ )
b[i]=a[i];
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cs_hlshl.c paw-2.14.04/src/pawlib/comis/deccc/cs_hlshl.c
---- paw-2.14.04~/src/pawlib/comis/deccc/cs_hlshl.c 1998-01-12 04:56:07.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/deccc/cs_hlshl.c 2006-09-08 14:48:50.060932620 -0400
+diff --git a/src/pawlib/comis/deccc/cs_hlshl.c b/src/pawlib/comis/deccc/cs_hlshl.c
+index a17a695..41a0c54 100644
+--- a/src/pawlib/comis/deccc/cs_hlshl.c
++++ b/src/pawlib/comis/deccc/cs_hlshl.c
@@ -25,9 +25,24 @@
#if (defined(CERNLIB_SUN)||defined(CERNLIB_SGI)||defined(CERNLIB_IBMRT)||defined(CERNLIB_ALPHA_OSF)||defined(CERNLIB_LINUX))&&(defined(CERNLIB_SHL))
/*CMZ : 22/05/95 18.40.45 by Julian Bunn*/
@@ -483,9 +500,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cs_hlshl.c paw-2.14.04/src/pawli
#if defined(CERNLIB_SGI)
#define SGI
#endif
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscal_lp64.h paw-2.14.04/src/pawlib/comis/deccc/cscal_lp64.h
---- paw-2.14.04~/src/pawlib/comis/deccc/cscal_lp64.h 1969-12-31 19:00:00.000000000 -0500
-+++ paw-2.14.04/src/pawlib/comis/deccc/cscal_lp64.h 2006-09-08 14:44:11.811263521 -0400
+diff --git a/src/pawlib/comis/deccc/cscal_lp64.h b/src/pawlib/comis/deccc/cscal_lp64.h
+new file mode 100644
+index 0000000..4ce358c
+--- /dev/null
++++ b/src/pawlib/comis/deccc/cscal_lp64.h
@@ -0,0 +1,74 @@
+#if defined(CERNLIB_QMLXIA64)
+/* Hideous hack macros that attempt to deal with 64-bit pointers using
@@ -561,9 +580,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscal_lp64.h paw-2.14.04/src/paw
+
+#endif
+
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscald.c paw-2.14.04/src/pawlib/comis/deccc/cscald.c
---- paw-2.14.04~/src/pawlib/comis/deccc/cscald.c 2004-10-27 05:01:54.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/deccc/cscald.c 2006-09-08 14:45:54.322410202 -0400
+diff --git a/src/pawlib/comis/deccc/cscald.c b/src/pawlib/comis/deccc/cscald.c
+index 53272de..3b3a9f1 100644
+--- a/src/pawlib/comis/deccc/cscald.c
++++ b/src/pawlib/comis/deccc/cscald.c
@@ -29,11 +29,10 @@
#define cscald
#undef cscald
@@ -578,7 +598,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscald.c paw-2.14.04/src/pawlib/
double cscald_ (name,n,p)
#endif
#if defined(CERNLIB_QXNO_SC)
-@@ -46,10 +45,30 @@
+@@ -46,10 +45,30 @@ double cscald (name,n,p)
int CSCALD (name,n,p)
# endif
#endif
@@ -610,9 +630,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscald.c paw-2.14.04/src/pawlib/
double d;
switch (*n)
{
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscali.c paw-2.14.04/src/pawlib/comis/deccc/cscali.c
---- paw-2.14.04~/src/pawlib/comis/deccc/cscali.c 2004-10-22 08:42:40.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/deccc/cscali.c 2006-09-08 14:46:14.981004397 -0400
+diff --git a/src/pawlib/comis/deccc/cscali.c b/src/pawlib/comis/deccc/cscali.c
+index 4dc63ce..82bcb34 100644
+--- a/src/pawlib/comis/deccc/cscali.c
++++ b/src/pawlib/comis/deccc/cscali.c
@@ -26,11 +26,10 @@
#define cscali
#undef cscali
@@ -627,7 +648,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscali.c paw-2.14.04/src/pawlib/
int cscali_ (name,n,p)
#endif
#if defined(CERNLIB_QXNO_SC)
-@@ -39,10 +38,30 @@
+@@ -39,10 +38,30 @@ int cscali (name,n,p)
#if defined(CERNLIB_QXCAPT)
int type_of_call CSCALI (name,n,p)
#endif
@@ -659,9 +680,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscali.c paw-2.14.04/src/pawlib/
int i;
switch (*n)
{
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscalr.c paw-2.14.04/src/pawlib/comis/deccc/cscalr.c
---- paw-2.14.04~/src/pawlib/comis/deccc/cscalr.c 2004-10-22 08:03:16.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/deccc/cscalr.c 2006-09-08 14:47:10.662129691 -0400
+diff --git a/src/pawlib/comis/deccc/cscalr.c b/src/pawlib/comis/deccc/cscalr.c
+index f89c5a7..cfa91f9 100644
+--- a/src/pawlib/comis/deccc/cscalr.c
++++ b/src/pawlib/comis/deccc/cscalr.c
@@ -30,19 +30,15 @@
#define cscalr
#undef cscalr
@@ -684,7 +706,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscalr.c paw-2.14.04/src/pawlib/
#if defined(CERNLIB_QXCAPT)
# if defined(CERNLIB_MSSTDCALL)
float type_of_call CSCALR(name,n,p)
-@@ -51,10 +47,42 @@
+@@ -51,10 +47,42 @@ float cscalr (name,n,p)
# endif
#endif
@@ -728,9 +750,10 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cscalr.c paw-2.14.04/src/pawlib/
float r;
switch (*n)
{
-diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cstrcmp.c paw-2.14.04/src/pawlib/comis/deccc/cstrcmp.c
---- paw-2.14.04~/src/pawlib/comis/deccc/cstrcmp.c 1997-09-02 11:50:44.000000000 -0400
-+++ paw-2.14.04/src/pawlib/comis/deccc/cstrcmp.c 2006-09-08 14:44:11.812263308 -0400
+diff --git a/src/pawlib/comis/deccc/cstrcmp.c b/src/pawlib/comis/deccc/cstrcmp.c
+index 9d93196..746e40b 100644
+--- a/src/pawlib/comis/deccc/cstrcmp.c
++++ b/src/pawlib/comis/deccc/cstrcmp.c
@@ -36,6 +36,43 @@
#else
int cstrcmp_(ja,na,jb,nb)
@@ -775,7 +798,7 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cstrcmp.c paw-2.14.04/src/pawlib
char **ja, **jb;
int *na, *nb;
{
-@@ -48,6 +85,7 @@
+@@ -48,6 +85,7 @@ int cstrcmp_(ja,na,jb,nb)
{
a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
}
@@ -783,10 +806,11 @@ diff -urNad paw-2.14.04~/src/pawlib/comis/deccc/cstrcmp.c paw-2.14.04/src/pawlib
for ( i=0; i<lb; i++ )
{ if(a[i] != b[i])
{ return ( (a[i] > b[i]) ? k : -k ); }
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_color.c paw-2.14.04/src/pawlib/paw/cmotif/att_color.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/att_color.c 1996-03-01 06:38:53.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/att_color.c 2006-09-08 14:44:11.812263308 -0400
-@@ -114,7 +114,7 @@
+diff --git a/src/pawlib/paw/cmotif/att_color.c b/src/pawlib/paw/cmotif/att_color.c
+index 817f56b..b489417 100644
+--- a/src/pawlib/paw/cmotif/att_color.c
++++ b/src/pawlib/paw/cmotif/att_color.c
+@@ -114,7 +114,7 @@ static void NewTarget_cb (Widget w,caddr_t client_data,
XtVaGetValues(ObjectRow,XmNmenuHistory,&CurrentObject,NULL);
XtVaGetValues(CurrentObject,XmNuserData,&data,NULL);
@@ -795,7 +819,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_color.c paw-2.14.04/src/pawli
case 1: /* Surface */
sprintf(Svalue,"%d",data->SurfaceColor);
break;
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ static void NewColor_cb (Widget w,caddr_t client_data,
Ncol=atoi((char *)XmTextGetString(NcolText));
} else Ncol=8;
ColorNum=atoi((char *)XmTextGetString(AttColorText));
@@ -804,10 +828,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_color.c paw-2.14.04/src/pawli
case 1: /* UpArrow */
ColorNum++;
break;
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c paw-2.14.04/src/pawlib/paw/cmotif/att_define_color.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c 1999-03-01 04:07:01.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/att_define_color.c 2006-09-08 14:44:11.812263308 -0400
-@@ -338,7 +338,7 @@
+diff --git a/src/pawlib/paw/cmotif/att_define_color.c b/src/pawlib/paw/cmotif/att_define_color.c
+index d809b17..6e819d2 100644
+--- a/src/pawlib/paw/cmotif/att_define_color.c
++++ b/src/pawlib/paw/cmotif/att_define_color.c
+@@ -338,7 +338,7 @@ static void apply_color (int sender)
static void MoveScale_cb(Widget w,caddr_t client_data,
XmAnyCallbackStruct *call_data)
{
@@ -816,7 +841,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c paw-2.14.04/sr
case 1 : /* RED */
EditColor.red=((XmScaleCallbackStruct *) call_data)->value;
break;
-@@ -369,7 +369,7 @@
+@@ -369,7 +369,7 @@ static void MoveScale_cb(Widget w,caddr_t client_data,
default :
fprintf(stderr,"Error in function MoveScale_cb");
} /*end of switch */
@@ -825,7 +850,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c paw-2.14.04/sr
}
/*****************************************************************************
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ static void NewColor_cb (Widget w,caddr_t client_data,
char *ComStr;
ColorNum=atoi((char *)XmTextGetString(ColorIndex));
@@ -834,7 +859,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c paw-2.14.04/sr
case 1: /* UpArrow */
ColorNum++;
break;
-@@ -494,7 +494,7 @@
+@@ -494,7 +494,7 @@ static void NewNcol_cb (Widget w,caddr_t client_data,
XmAnyCallbackStruct cb;
Ncol=atoi((char *)XmTextGetString(NcolText));
@@ -843,10 +868,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_define_color.c paw-2.14.04/sr
case 1: /* UpArrow*/
Ncol++;
break;
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_general.c paw-2.14.04/src/pawlib/paw/cmotif/att_general.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/att_general.c 1996-03-01 06:38:53.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/att_general.c 2006-09-08 14:44:11.813263095 -0400
-@@ -454,7 +454,7 @@
+diff --git a/src/pawlib/paw/cmotif/att_general.c b/src/pawlib/paw/cmotif/att_general.c
+index 9866d5c..093d0d8 100644
+--- a/src/pawlib/paw/cmotif/att_general.c
++++ b/src/pawlib/paw/cmotif/att_general.c
+@@ -454,7 +454,7 @@ static void MarkerMenu_cb(Widget w,caddr_t client_data,
{
char ComStr[15];
@@ -855,7 +881,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_general.c paw-2.14.04/src/paw
execute_kuip_cmd(ComStr);
if (appres.auto_refresh) {
plot_current_histo();
-@@ -471,8 +471,8 @@
+@@ -471,8 +471,8 @@ static void LineMenu_cb(Widget w,caddr_t client_data,
{
char ComStr[15];
@@ -866,10 +892,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_general.c paw-2.14.04/src/paw
execute_kuip_cmd(ComStr);
if (appres.auto_refresh) {
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_geometry.c paw-2.14.04/src/pawlib/paw/cmotif/att_geometry.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/att_geometry.c 1999-02-01 12:56:11.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/att_geometry.c 2006-09-08 14:44:11.815262668 -0400
-@@ -2582,7 +2582,7 @@
+diff --git a/src/pawlib/paw/cmotif/att_geometry.c b/src/pawlib/paw/cmotif/att_geometry.c
+index a2872f1..65177d6 100644
+--- a/src/pawlib/paw/cmotif/att_geometry.c
++++ b/src/pawlib/paw/cmotif/att_geometry.c
+@@ -2582,7 +2582,7 @@ static void ValueChange_cb(Widget w,caddr_t client_data,
char *ComStr;
XtVaGetValues(CButton,XmNuserData,&data,NULL);
@@ -878,10 +905,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_geometry.c paw-2.14.04/src/pa
case 1 : /**** value change in text */
Fvalue= (float)atof((char *)XmTextGetString(Text));
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib/paw/cmotif/att_main.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c 1996-03-01 06:38:54.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/att_main.c 2006-09-08 14:44:11.816262455 -0400
-@@ -139,7 +139,7 @@
+diff --git a/src/pawlib/paw/cmotif/att_main.c b/src/pawlib/paw/cmotif/att_main.c
+index 58b264c..f8afed4 100644
+--- a/src/pawlib/paw/cmotif/att_main.c
++++ b/src/pawlib/paw/cmotif/att_main.c
+@@ -139,7 +139,7 @@ void put_attributes_color(char *label,char *value)
{
int i;
XmAnyCallbackStruct cb;
@@ -890,7 +918,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib
char tempstr[6];
int tempint;
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ void put_attributes_color(char *label,char *value)
switch (*label) {
case 'B' :
@@ -899,7 +927,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib
strncpy(tempstr,value,pos);
tempint=atoi(tempstr);
if (tempint>=1000) {
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ void put_attributes_color(char *label,char *value)
StateObject[i].ContourColor=tempint;
StateObject[i].SurfaceColor=0;
}
@@ -908,7 +936,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib
strncpy(tempstr,value,2);
StateObject[i].StatColor=tempstr[1]-'0';
StateObject[i].ZoneColor=tempstr[0]-'0';
-@@ -324,12 +324,12 @@
+@@ -324,12 +324,12 @@ void put_attributes_attributes(char *label,char *value)
static char *Clean(char *string)
{
char *Apos;
@@ -923,7 +951,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib
strcpy(end,++Apos);
string[pos]='\0';
strcat(Clean(string),"@'");
-@@ -692,7 +692,7 @@
+@@ -692,7 +692,7 @@ static void LineWidthScale_cb(Widget w,caddr_t client_data,
XtVaGetValues(ObjectRow,XmNmenuHistory,&CurrentToggle,NULL);
XtVaGetValues(CurrentToggle,XmNuserData,&CurrentState,NULL);
LineWidth=CurrentState->LineWidth;
@@ -932,10 +960,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/att_main.c paw-2.14.04/src/pawlib
case 1: /* UpArrow */
LineWidth++;
break;
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/attatch.c paw-2.14.04/src/pawlib/paw/cmotif/attatch.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/attatch.c 1996-03-01 06:38:54.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/attatch.c 2006-09-08 14:44:11.816262455 -0400
-@@ -88,7 +88,7 @@
+diff --git a/src/pawlib/paw/cmotif/attatch.c b/src/pawlib/paw/cmotif/attatch.c
+index 25cad01..f80af97 100644
+--- a/src/pawlib/paw/cmotif/attatch.c
++++ b/src/pawlib/paw/cmotif/attatch.c
+@@ -88,7 +88,7 @@ static void ValueChange_cb(Widget w,caddr_t client_data,
XtVaGetValues(ObjectRow,XmNmenuHistory,&CurrentObject,NULL);
XtVaGetValues(CurrentObject,XmNuserData,&data,NULL);
@@ -944,7 +973,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/attatch.c paw-2.14.04/src/pawlib/
case 1 : /**** value change in text */
Svalue=(char *)XmTextGetString(IndexText);
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ static void ValueChange_cb(Widget w,caddr_t client_data,
/* value change in scale */
XmScaleGetValue(w,&Ivalue);
Svalue=(char *)XmTextGetString(IndexText);
@@ -953,10 +982,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/attatch.c paw-2.14.04/src/pawlib/
XmTextSetString(IndexText,Svalue);
if (data->IndexHatch!=atoi(Svalue)) {
data->IndexHatch=atoi(Svalue);
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/axis.c paw-2.14.04/src/pawlib/paw/cmotif/axis.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/axis.c 1996-03-01 06:38:54.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/axis.c 2006-09-08 14:44:11.817262242 -0400
-@@ -1336,7 +1336,7 @@
+diff --git a/src/pawlib/paw/cmotif/axis.c b/src/pawlib/paw/cmotif/axis.c
+index d7ba6c1..15a27f8 100644
+--- a/src/pawlib/paw/cmotif/axis.c
++++ b/src/pawlib/paw/cmotif/axis.c
+@@ -1336,7 +1336,7 @@ static void set_or(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
{
XmAnyCallbackStruct cbs1;
@@ -965,7 +995,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/axis.c paw-2.14.04/src/pawlib/paw
case 1:
axis.xo = 1;
break;
-@@ -1432,7 +1432,7 @@
+@@ -1432,7 +1432,7 @@ static void set_label(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
unselect_list();
comstr = XtCalloc(MAX_CMD_LENGTH, 1);
@@ -974,7 +1004,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/axis.c paw-2.14.04/src/pawlib/paw
case 0:
XmToggleButtonGadgetSetState(labeltoggleButtonGadget0,True,False);
-@@ -1680,7 +1680,7 @@
+@@ -1680,7 +1680,7 @@ static void insert_label(Widget w, int* num, XmAnyCallbackStruct *cbs)
cbs1.reason = 0;
cbs1.event = (XEvent *) NULL;
@@ -983,10 +1013,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/axis.c paw-2.14.04/src/pawlib/paw
case 1:
if (XmToggleButtonGadgetGetState(labeltoggleButtonGadget1))
XtCallCallbacks(labeltoggleButtonGadget1,XmNvalueChangedCallback,
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/paw/cmotif/histo.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/histo.c 1996-03-01 06:38:56.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/histo.c 2006-09-08 14:44:11.818262029 -0400
-@@ -529,7 +529,7 @@
+diff --git a/src/pawlib/paw/cmotif/histo.c b/src/pawlib/paw/cmotif/histo.c
+index 7465918..6b1e8ab 100644
+--- a/src/pawlib/paw/cmotif/histo.c
++++ b/src/pawlib/paw/cmotif/histo.c
+@@ -529,7 +529,7 @@ static void popdown_cb(Widget w, XtPointer call_data,
static void show_option(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
{
if (cbs->set) {
@@ -995,7 +1026,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
case 1:
if ( !widget_stat ) {
widget_stat = create_statFormDialog();
-@@ -651,7 +651,7 @@
+@@ -651,7 +651,7 @@ static void show_option(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
return;
}
} else {
@@ -1004,7 +1035,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
case 1:
if (widget_stat) {
XtUnmanageChild(widget_stat);
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@ static void show_set(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
int x,y;
@@ -1013,7 +1044,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
case 1:
sprintf (comstr,"Set STAT %d%d%d%d%d%d%d"
,XmToggleButtonGadgetGetState(AllchanToggleButtonGadget)
-@@ -996,7 +996,7 @@
+@@ -996,7 +996,7 @@ static void show_set(Widget w, int *type, XmToggleButtonCallbackStruct *cbs)
static void coordinate_set(Widget w, int *type, XmAnyCallbackStruct *cbs)
{
@@ -1022,7 +1053,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
case 1:
sprintf (histogram.coordinate," ");
break;
-@@ -1034,7 +1034,7 @@
+@@ -1034,7 +1034,7 @@ static void show_range(Widget w, int *type, XmScaleCallbackStruct *cbs)
int ilen1, ilen2;
XmString xmstr;
@@ -1031,7 +1062,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
case 1:
histogram.x1 = cbs->value;
if( x_range_lock != 0 ) {
-@@ -1131,7 +1131,7 @@
+@@ -1131,7 +1131,7 @@ static void show_range(Widget w, int *type, XmScaleCallbackStruct *cbs)
if( histogram.y1 <= 0 ) histogram.y1 = 1;
if( histogram.y2 <= 0 ) histogram.y2 = 1;
@@ -1040,10 +1071,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/histo.c paw-2.14.04/src/pawlib/pa
XmScaleSetValue(X2Scale,histogram.x2);
XmScaleSetValue(X1Scale,histogram.x1);
if( x_range_lock == 0 || upd_nbin) {
-diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/init.c paw-2.14.04/src/pawlib/paw/cmotif/init.c
---- paw-2.14.04~/src/pawlib/paw/cmotif/init.c 1996-03-12 11:58:51.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/cmotif/init.c 2006-09-08 14:44:11.818262029 -0400
-@@ -286,7 +286,7 @@
+diff --git a/src/pawlib/paw/cmotif/init.c b/src/pawlib/paw/cmotif/init.c
+index 9864f07..244e250 100644
+--- a/src/pawlib/paw/cmotif/init.c
++++ b/src/pawlib/paw/cmotif/init.c
+@@ -286,7 +286,7 @@ String *get_paw_fallbacks ()
static void destroy_browser(Widget w, int *which, XmAnyCallbackStruct *cbs)
{
MenuCbStruct *menu_item;
@@ -1052,7 +1084,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/init.c paw-2.14.04/src/pawlib/paw
browser[i].widget = NULL;
if (browser[i].open_dialog) {
-@@ -308,7 +308,7 @@
+@@ -308,7 +308,7 @@ static void destroy_browser(Widget w, int *which, XmAnyCallbackStruct *cbs)
***********************************************************************/
static void destroy_graphics(Widget w, int *which, XmAnyCallbackStruct *cbs)
{
@@ -1061,9 +1093,10 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/cmotif/init.c paw-2.14.04/src/pawlib/paw
graphics[i].widget = NULL;
}
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/c_hcntpar.h paw-2.14.04/src/pawlib/paw/ntuple/c_hcntpar.h
---- paw-2.14.04~/src/pawlib/paw/ntuple/c_hcntpar.h 1996-04-23 14:37:45.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/c_hcntpar.h 2006-09-08 14:44:11.818262029 -0400
+diff --git a/src/pawlib/paw/ntuple/c_hcntpar.h b/src/pawlib/paw/ntuple/c_hcntpar.h
+index 65554bf..97bc611 100644
+--- a/src/pawlib/paw/ntuple/c_hcntpar.h
++++ b/src/pawlib/paw/ntuple/c_hcntpar.h
@@ -47,7 +47,7 @@
#define ZID 12
#define ZITMP 10
@@ -1073,22 +1106,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/c_hcntpar.h paw-2.14.04/src/pawli
#define ZLINK 6
#endif /* CERN_C_HCNTPAR */
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawlib/paw/ntuple/qp_execute.c
---- paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c 2001-09-18 09:41:35.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/qp_execute.c 2006-09-08 14:44:11.819261816 -0400
-@@ -184,12 +184,19 @@
- /* all definitions for the stack */
- #undef INIT_STACK_TO_NULL /* are kept together in this file */
-
-+#if defined(CERNLIB_QMLXIA64)
-+# undef HBALLOC
-+# undef HGNTBF
-+# define HBALLOC HBALLOC64
-+# define HGNTBF HGNTBF64
-+#endif
-+
- /* extern functions */
- extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
+diff --git a/src/pawlib/paw/ntuple/qp_execute.c b/src/pawlib/paw/ntuple/qp_execute.c
+index 56abaa4..c11cde2 100644
+--- a/src/pawlib/paw/ntuple/qp_execute.c
++++ b/src/pawlib/paw/ntuple/qp_execute.c
+@@ -189,7 +189,7 @@ extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
typedef char tName[MAX_NAME_LEN+1];
tName *namelist;
@@ -1097,7 +1119,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
int *indexlist;
-@@ -245,7 +252,23 @@
+@@ -245,7 +245,23 @@ qp_exec_init(
char ntname[MAX_NAME_LEN+6];
int i, ierr, indx, itype, isize, ielem;
Int32 * addr;
@@ -1122,7 +1144,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
int id = qe->id;
char * path = qe->path;
char * title;
-@@ -286,7 +309,11 @@
+@@ -286,7 +302,11 @@ qp_exec_init(
CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
@@ -1135,7 +1157,16 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
qp_assert(
CWNBlock != 0 &&
-@@ -381,6 +408,7 @@
+@@ -342,7 +362,7 @@ qp_exec_init(
+ break;
+ }
+
+- HBALLOC( id, path, name, block, itype, isize, start_evt,
++ HBALLOC64( id, path, name, block, itype, isize, start_evt,
+ nevt*ielem, ibase, ioff, nuse );
+
+ if ( qp_flags_get( "cache" ) != 0 ) {
+@@ -381,6 +401,7 @@ qp_exec_init(
offsetlist[nt_load_cnt]=
CWNBlock[index].p -
PAWC.iq_eqv;
@@ -1143,7 +1174,16 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
strncpy(
namelist[nt_load_cnt],
vi->name,
-@@ -871,8 +899,21 @@
+@@ -473,7 +494,7 @@ qp_exec_init(
+ indx = h_rwn_getIndex( qe->id, v->name );
+ qp_assert( indx >= 0 );
+
+- HBALLOC( id, path, name, "RWN", 1, 4, start_evt,
++ HBALLOC64( id, path, name, "RWN", 1, 4, start_evt,
+ nevt, ibase, ioff, nuse );
+
+ if ( qp_flags_get( "cache" ) != 0 ) {
+@@ -871,8 +892,21 @@ if ( qp_flags_get( "cache" ) != 0 ) {
if ( cmd->u.scan.pawpp ) {
char buf[33];
@@ -1165,7 +1205,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
qp_assert( qe->nexpr <= MAX_OUTSTR );
-@@ -1791,6 +1832,31 @@
+@@ -1791,6 +1825,31 @@ exec_comis( long ievt, long ievt_chain, FCode fc, int iaddr, int npar, int *errp
PAWIDN.idnevt = ievt;
PAWCHN.ichevt = ievt_chain;
@@ -1197,7 +1237,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
switch ( npar ) {
case 8: p8 = &stack[frame[framep-7]];
case 7: p7 = &stack[frame[framep-6]];
-@@ -1808,6 +1874,7 @@
+@@ -1808,6 +1867,7 @@ exec_comis( long ievt, long ievt_chain, FCode fc, int iaddr, int npar, int *errp
return FALSE;
break;
}
@@ -1205,10 +1245,28 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_execute.c paw-2.14.04/src/pawl
switch ( fc ) {
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_hbook_if.c paw-2.14.04/src/pawlib/paw/ntuple/qp_hbook_if.c
---- paw-2.14.04~/src/pawlib/paw/ntuple/qp_hbook_if.c 1999-07-05 11:43:35.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/qp_hbook_if.c 2006-09-08 14:44:11.820261603 -0400
-@@ -149,7 +149,15 @@
+@@ -2498,11 +2558,11 @@ qp_execute(
+ if ( nt_load_from_disk ) {
+ if ( is_cwn ) {
+ if ( new_file ) {
+- HGNTBF( qe->id,
+- namelist,
+- offsetlist,
+- nt_load_cnt,
+- ievtlcl, ierr );
++ HGNTBF64(qe->id,
++ namelist,
++ offsetlist,
++ nt_load_cnt,
++ ievtlcl, ierr);
+ new_file = FALSE;
+ } else {
+ HGNTF( qe->id,
+diff --git a/src/pawlib/paw/ntuple/qp_hbook_if.c b/src/pawlib/paw/ntuple/qp_hbook_if.c
+index 9a6ea4f..3adf8d4 100644
+--- a/src/pawlib/paw/ntuple/qp_hbook_if.c
++++ b/src/pawlib/paw/ntuple/qp_hbook_if.c
+@@ -149,7 +149,15 @@ h_load_nt(
int idn, idtmp;
int icycle;
int ierr;
--
PAW: Physics Analysis Workstation
More information about the debian-science-commits
mailing list