Merge branch 'master' of https://github.com/Unidata/netcdf-c

libdispatch/Makefile.am

@@ -1,44 +1,52 @@
-## This is a automake file, part of Unidata's netCDF package.
-# Copyright 2005, see the COPYRIGHT file for more information.
-
-# This Makefile controls the building of the dispatch layer of the
-# netCDF library. The dispatch layer decides whether to call the
-# netcdf-classic code, netcdf-4 code, nc3 dap code, or nc4 dap
-# code. It also contains code that sit above the dispatch layer, like
-# the v2 API.
-
-# Put together AM_CPPFLAGS and AM_LDFLAGS.
-include $(top_srcdir)/lib_flags.am
-
-# This is our output, the dispatch convenience library.
-noinst_LTLIBRARIES = libdispatch.la
-libdispatch_la_CPPFLAGS = ${AM_CPPFLAGS}
-
-# The source files.
-libdispatch_la_SOURCES = dparallel.c dcopy.c dfile.c ddim.c datt.c	\
-dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c	\
-dvarinq.c ddispatch.c                                                   \
-nclog.c dstring.c dutf8proc.c utf8proc_data.h                          \
-ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c                        \
-dsubstrate.c \
-nc.c nclistmgr.c
-
-# Add functions only found in netCDF-4.
-if USE_NETCDF4
-libdispatch_la_SOURCES += dgroup.c dvlen.c dcompound.c dtype.c denum.c	\
-dopaque.c ncaux.c
-endif # USE_NETCDF4
-
-# Turn on pre-processor flag when building a DLL for windows.
-if BUILD_DLL
-libdispatch_la_CPPFLAGS += -DDLL_EXPORT
-endif # BUILD_DLL
-
-# Add V2 API convenience library if needed.
-if BUILD_V2
-noinst_LTLIBRARIES += libnetcdf2.la 
-libnetcdf2_la_SOURCES = dv2i.c
-libnetcdf2_la_CPPFLAGS = ${AM_CPPFLAGS} -DDLL_EXPORT
-endif # BUILD_V2
-
-EXTRA_DIST=CMakeLists.txt
+## This is a automake file, part of Unidata's netCDF package.
+# Copyright 2005, see the COPYRIGHT file for more information.
+
+# This Makefile controls the building of the dispatch layer of the
+# netCDF library. The dispatch layer decides whether to call the
+# netcdf-classic code, netcdf-4 code, nc3 dap code, or nc4 dap
+# code. It also contains code that sit above the dispatch layer, like
+# the v2 API.
+
+# Put together AM_CPPFLAGS and AM_LDFLAGS.
+include $(top_srcdir)/lib_flags.am
+
+# This is our output, the dispatch convenience library.
+noinst_LTLIBRARIES = libdispatch.la
+libdispatch_la_CPPFLAGS = ${AM_CPPFLAGS}
+
+# The source files.
+libdispatch_la_SOURCES = dparallel.c dcopy.c dfile.c ddim.c datt.c	\
+dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c	\
+dvarinq.c ddispatch.c                                                   \
+nclog.c dstring.c dutf8proc.c utf8proc_data.h                          \
+ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c                        \
+dsubstrate.c \
+nc.c nclistmgr.c \
+ncsettings.c
+
+# Add functions only found in netCDF-4.
+if USE_NETCDF4
+libdispatch_la_SOURCES += dgroup.c dvlen.c dcompound.c dtype.c denum.c	\
+dopaque.c ncaux.c
+endif # USE_NETCDF4
+
+# Turn on pre-processor flag when building a DLL for windows.
+if BUILD_DLL
+libdispatch_la_CPPFLAGS += -DDLL_EXPORT
+endif # BUILD_DLL
+
+# Add V2 API convenience library if needed.
+if BUILD_V2
+noinst_LTLIBRARIES += libnetcdf2.la 
+libnetcdf2_la_SOURCES = dv2i.c
+libnetcdf2_la_CPPFLAGS = ${AM_CPPFLAGS} -DDLL_EXPORT
+endif # BUILD_V2
+
+EXTRA_DIST=CMakeLists.txt ncsettings.hdr
+
+ncsettings.c: $(top_srcdir)/libnetcdf.settings ncsettings.hdr
+	rm -f ncsettings.c
+	cat ncsettings.hdr > ncsettings.c
+	sed -e 's/"/\\"/g' <$(top_srcdir)/libnetcdf.settings | sed -e 's/\(.*\)/"\1\\n"/' >> ncsettings.c
+	echo ';' >> ncsettings.c
+	

libdispatch/ncsettings.hdr

@@ -0,0 +1,36 @@
+/*********************************************************************
+  *   Copyright 2014, UCAR/Unidata
+  *   See netcdf/COPYRIGHT file for copying and redistribution conditions.
+  *********************************************************************/
+
+#include "config.h"
+#include <stdlib.h>
+
+static const char* ncsettings;
+
+static char** map = NULL;
+static void parse();
+
+const char*
+nc_settings(const char* key)
+{
+    char** mapp;
+    int keylen = strlen(key);
+    if(map == NULL)
+	parse();
+    for(mapp=map;*mapp != NULL;mapp+=2) {
+	/* Note this assumes that no key is a prefix of another */
+	if(strncmp(*mapp,key,keylen)==0) {
+	    return mapp[1];
+	}
+    }    
+    return NULL;
+}
+
+static void parse()
+{
+}
+
+static const char* ncsettings =
+
+