Split input and output routines of stream_cdf.c to stream_cdf_i.c and stream_cdf_o.c.

src/Makefile.am

@@ -71,7 +71,8 @@ libcdi_la_SOURCES = 	 \
 	resource_handle.h\
 	service.h	 \
 	servicelib.c     \
-	stream_cdf.c     \
+	stream_cdf_i.c   \
+	stream_cdf_o.c   \
 	stream_cdf.h	 \
 	stream_cgribex.c \
 	stream_cgribex.h \

src/Makefile.in

@@ -177,19 +177,20 @@ am__libcdi_la_SOURCES_DIST = basetime.c basetime.h binary.c binary.h \
 	input_file.c input_file.h institution.c institution.h model.c \
 	model.h namespace.c namespace.h serialize.h serialize.c \
 	referenceCounting.c referenceCounting.h resource_handle.c \
-	resource_handle.h service.h servicelib.c stream_cdf.c \
-	stream_cdf.h stream_cgribex.c stream_cgribex.h stream_ext.c \
-	stream_ext.h stream_grb.c stream_grb.h stream_gribapi.h \
-	stream_history.c stream_ieg.c stream_ieg.h cdi_int.c cdi_int.h \
-	stream_record.c stream_srv.c stream_srv.h stream_var.c \
-	grb_write.c grb_read.c cdf_write.c cdf_read.c subtype.c \
-	subtype.h swap.h table.c table.h tablepar.h taxis.c taxis.h \
-	timebase.c timebase.h tsteps.c util.c varscan.c varscan.h \
-	version.c vlist.c vlist.h vlist_att.c vlist_att.h vlist_var.c \
-	vlist_var.h zaxis.c zaxis.h stream.c stream_write.c \
-	stream_read.c swap.c iterator.c iterator.h iterator_fallback.c \
-	iterator_fallback.h iterator_grib.c iterator_grib.h cfortran.h \
-	cdiFortran.c gribapi_utilities.c stream_gribapi.c
+	resource_handle.h service.h servicelib.c stream_cdf_i.c \
+	stream_cdf_o.c stream_cdf.h stream_cgribex.c stream_cgribex.h \
+	stream_ext.c stream_ext.h stream_grb.c stream_grb.h \
+	stream_gribapi.h stream_history.c stream_ieg.c stream_ieg.h \
+	cdi_int.c cdi_int.h stream_record.c stream_srv.c stream_srv.h \
+	stream_var.c grb_write.c grb_read.c cdf_write.c cdf_read.c \
+	subtype.c subtype.h swap.h table.c table.h tablepar.h taxis.c \
+	taxis.h timebase.c timebase.h tsteps.c util.c varscan.c \
+	varscan.h version.c vlist.c vlist.h vlist_att.c vlist_att.h \
+	vlist_var.c vlist_var.h zaxis.c zaxis.h stream.c \
+	stream_write.c stream_read.c swap.c iterator.c iterator.h \
+	iterator_fallback.c iterator_fallback.h iterator_grib.c \
+	iterator_grib.h cfortran.h cdiFortran.c gribapi_utilities.c \
+	stream_gribapi.c
 am__objects_1 = cdiFortran.lo
 @USE_FC_TRUE@am__objects_2 = $(am__objects_1)
 am__objects_3 = gribapi_utilities.lo stream_gribapi.lo
@@ -200,14 +201,15 @@ am_libcdi_la_OBJECTS = basetime.lo binary.lo calendar.lo cdf.lo \
 	gaussgrid.lo gribapi.lo grid.lo ieglib.lo input_file.lo \
 	institution.lo model.lo namespace.lo serialize.lo \
 	referenceCounting.lo resource_handle.lo servicelib.lo \
-	stream_cdf.lo stream_cgribex.lo stream_ext.lo stream_grb.lo \
-	stream_history.lo stream_ieg.lo cdi_int.lo stream_record.lo \
-	stream_srv.lo stream_var.lo grb_write.lo grb_read.lo \
-	cdf_write.lo cdf_read.lo subtype.lo table.lo taxis.lo \
-	timebase.lo tsteps.lo util.lo varscan.lo version.lo vlist.lo \
-	vlist_att.lo vlist_var.lo zaxis.lo stream.lo stream_write.lo \
-	stream_read.lo swap.lo iterator.lo iterator_fallback.lo \
-	iterator_grib.lo $(am__objects_2) $(am__objects_4)
+	stream_cdf_i.lo stream_cdf_o.lo stream_cgribex.lo \
+	stream_ext.lo stream_grb.lo stream_history.lo stream_ieg.lo \
+	cdi_int.lo stream_record.lo stream_srv.lo stream_var.lo \
+	grb_write.lo grb_read.lo cdf_write.lo cdf_read.lo subtype.lo \
+	table.lo taxis.lo timebase.lo tsteps.lo util.lo varscan.lo \
+	version.lo vlist.lo vlist_att.lo vlist_var.lo zaxis.lo \
+	stream.lo stream_write.lo stream_read.lo swap.lo iterator.lo \
+	iterator_fallback.lo iterator_grib.lo $(am__objects_2) \
+	$(am__objects_4)
 libcdi_la_OBJECTS = $(am_libcdi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -514,19 +516,19 @@ libcdi_la_SOURCES = basetime.c basetime.h binary.c binary.h calendar.c \
 	input_file.h institution.c institution.h model.c model.h \
 	namespace.c namespace.h serialize.h serialize.c \
 	referenceCounting.c referenceCounting.h resource_handle.c \
-	resource_handle.h service.h servicelib.c stream_cdf.c \
-	stream_cdf.h stream_cgribex.c stream_cgribex.h stream_ext.c \
-	stream_ext.h stream_grb.c stream_grb.h stream_gribapi.h \
-	stream_history.c stream_ieg.c stream_ieg.h cdi_int.c cdi_int.h \
-	stream_record.c stream_srv.c stream_srv.h stream_var.c \
-	grb_write.c grb_read.c cdf_write.c cdf_read.c subtype.c \
-	subtype.h swap.h table.c table.h tablepar.h taxis.c taxis.h \
-	timebase.c timebase.h tsteps.c util.c varscan.c varscan.h \
-	version.c vlist.c vlist.h vlist_att.c vlist_att.h vlist_var.c \
-	vlist_var.h zaxis.c zaxis.h stream.c stream_write.c \
-	stream_read.c swap.c iterator.c iterator.h iterator_fallback.c \
-	iterator_fallback.h iterator_grib.c iterator_grib.h \
-	$(am__append_2) $(am__append_3)
+	resource_handle.h service.h servicelib.c stream_cdf_i.c \
+	stream_cdf_o.c stream_cdf.h stream_cgribex.c stream_cgribex.h \
+	stream_ext.c stream_ext.h stream_grb.c stream_grb.h \
+	stream_gribapi.h stream_history.c stream_ieg.c stream_ieg.h \
+	cdi_int.c cdi_int.h stream_record.c stream_srv.c stream_srv.h \
+	stream_var.c grb_write.c grb_read.c cdf_write.c cdf_read.c \
+	subtype.c subtype.h swap.h table.c table.h tablepar.h taxis.c \
+	taxis.h timebase.c timebase.h tsteps.c util.c varscan.c \
+	varscan.h version.c vlist.c vlist.h vlist_att.c vlist_att.h \
+	vlist_var.c vlist_var.h zaxis.c zaxis.h stream.c \
+	stream_write.c stream_read.c swap.c iterator.c iterator.h \
+	iterator_fallback.c iterator_fallback.h iterator_grib.c \
+	iterator_grib.h $(am__append_2) $(am__append_3)
 
 # cfortran.h is an optional part of libcdi
 libcdi_la_USE_FC_extra_sources = \
@@ -740,7 +742,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serialize.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicelib.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_cdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_cdf_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_cdf_o.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_cgribex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_ext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_grb.Plo@am__quote@
@@ -934,8 +937,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_CDI_LIB_FALSE@uninstall-local:
 @ENABLE_CDI_LIB_FALSE@install-exec-local:
+@ENABLE_CDI_LIB_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

src/make_cdilib

@@ -123,7 +123,8 @@ files="basetime.c \
    stream.c \
    stream_write.c \
    stream_read.c \
-   stream_cdf.c \
+   stream_cdf_i.c \
+   stream_cdf_o.c \
    stream_cgribex.c \
    stream_ext.c \
    stream_grb.c \