From b7f74c9cb423269a5332d72606f3bc47c2aab822 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@unidata.ucar.edu>
Date: Mon, 12 Dec 2011 23:49:27 +0000
Subject: [PATCH] Moved Jira release notes into RELEASE_NOTES

---
 RELEASE_NOTES     | 92 ++++++++++++++++++++++++++++++++++++++++++++++-
 cf                |  2 +-
 libdap2/daputil.c | 11 +++---
 ncgen/ncgen.y     |  6 ++++
 ncgen/ncgenyy.c   |  4 +--
 5 files changed, 107 insertions(+), 8 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 52598ae64..333864766 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,7 +3,96 @@ Entries are in reverse chronological order (most recent first).
 
 VERSION         COMMENTS
 -------         --------
-4.2-rc1		2011-12-11
+4.2-rc1		2011-12-11 (Note: Jira entries include reference to '[NCF-XX]')
+
+		Cleaned up the definition and use of nulldup.
+		[NCF-92][NCF-93][NCF-94]
+
+	        Fixed various '#include' bugs.
+	        [NCF-91][NCF-96][NCF-127]
+
+		v2 API functions modified to properly call the external API
+                instead of directly calling the netcdf-3 functions.
+                [NCF-100]
+
+		Fixed problem with 64-bit offset format where writing more
+                than 2**31 records resulted in erroneous NC_EINVALCOORDS error.
+		[NCF-101]
+
+		Fixed problem when a url is provided that contains only a
+                host name.
+		[NCF-103]
+
+		Restored original functionality of ncgen so that a call with
+                no flags, only does the syntax check.
+		[NCF-104]
+
+		Properly convert vara start/count parameters to DAP
+		[NCF-105][NCF-106]
+
+		Corrected misc. test bugs
+		[NCF-107]
+
+		Modified ncdump to properly output various new types
+		(ubyte, ushort, uint, int64, and uint64).
+		[NCF-111]
+
+		Fixed incorrect link flag for szip in configure.ac
+		[NCF-116]
+
+		Completely rebuilt the dap constraint handling.
+                This primarily affects users who specify a DAP constraint
+                as part of their url.
+		[NCF-120]
+
+		In ncdump, add -g option to support selection of groups
+                for which data is displayed.
+		[NCF-11]
+
+		ncdump -t now properly parses ISO "T" separator in
+                date-time strings.
+		[NCF-16]
+
+		Separate the Fortran and C++ libraries and release
+                the C library and ncdump/ncgen/nccopy without Fortran or C++.
+		[NCF-24]
+
+		Documentation migrated to doxygen
+		[NCF-26]
+
+		Now supports bluefire
+		[NCF-52]
+
+		ncdump -t functionality now available for attributes
+                and bounds variables
+		[NCF-70]
+
+		ncdump now properly displays values of attributes
+                of type NC_USHORT as signed shorts
+		[NCF-82]
+
+		Improve use of chunk cache in nccopy utility, making it
+                practical for rechunking large files.
+		[NCF-85]
+
+		Rename some code files so that there are no duplicate filenames.
+		[NCF-99]
+
+		Demonstration of netCDF-4 Performance Improvement with KNMI Data
+		[NCF-113]
+
+		Dimension size in classic model netCDF-4 files now allows
+                larger sizes than allowed for 64-bit offset classic files.
+		[NCF-117]
+
+		ncdump now reports correct error message when "-x" option
+                specifying NcML output is used on netCDF-4 enhanced model input.
+		[NCF-129]
+
+		Fix bug causing infinite loop in ncdump -c of
+                netCDF-4 file with subgroup with variables using
+                inherited dimensions
+		[NCF-136]
 
 4.1.3-rc1       2011-05-06
 		Stop looking for xdr if --disable-dap is used.
@@ -1110,3 +1199,4 @@ VERSION         COMMENTS
 		A comparison of the netCDF-2 and netCDF-3 releases can
 		be found in the file COMPATIBILITY.
 
+
diff --git a/cf b/cf
index 1fbb07fa5..067efb150 100644
--- a/cf
+++ b/cf
@@ -2,7 +2,7 @@
 #X="-x"
 
 #HDF5=1
-DAP=1
+#DAP=1
 #CDMR=1
 #RPC=1
 
diff --git a/libdap2/daputil.c b/libdap2/daputil.c
index 6714d7680..8f9eb5743 100644
--- a/libdap2/daputil.c
+++ b/libdap2/daputil.c
@@ -21,10 +21,13 @@ extern int oc_dumpnode(OClink, OCobject);
 static char* makepathstring3(CDFnode* var, const char* separator, int ocify);
 
 /**************************************************/
-/* Provide a hidden interface to allow utilities*/
-/* to check if a given path name is really an ncdap3 url.*/
-/* If no, return null, else return basename of the url*/
-/* minus any extension*/
+/**
+ * Provide a hidden interface to allow utilities*/
+ * to check if a given path name is really an ncdap3 url.*/
+ * If no, return null, else return basename of the url*/
+ * minus any extension.
+ */
+
 int
 nc__testurl(const char* path, char** basenamep)
 {
diff --git a/ncgen/ncgen.y b/ncgen/ncgen.y
index e21591061..d3e2dc749 100644
--- a/ncgen/ncgen.y
+++ b/ncgen/ncgen.y
@@ -794,8 +794,14 @@ datalist1: /* Must have at least 1 element */
 dataitem:
 	  constdata {$$=$1;}
 	| '{' datalist '}' {$$=builddatasublist($2);}
+        | FCN arglist ')' {}
 	;
 
+arglist:
+          dataitem
+        | arglist ',' dataitem
+        ;
+
 constdata:
 	  simpleconstant      {$$=$1;}
 	| OPAQUESTRING	{$$=makeconstdata(NC_OPAQUE);}
diff --git a/ncgen/ncgenyy.c b/ncgen/ncgenyy.c
index c74eb5dc4..108fd614c 100644
--- a/ncgen/ncgenyy.c
+++ b/ncgen/ncgenyy.c
@@ -1409,7 +1409,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( ncgtext, ncgleng, 1, ncgout )) {} } while (0)
+#define ECHO fwrite( ncgtext, ncgleng, 1, ncgout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1420,7 +1420,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( ncgin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \