Rename svc to srv.

tests/Makefile.am

@@ -68,7 +68,7 @@ EXTRA_DIST = test_cdf_write.c test_cdf_read.c test_cksum_base
 AUTOMAKE_OPTIONS = color-tests
 #
 clean-local: clean-local-dirs
-	-rm -f *~ *.grb *.nc *.nc2 *.nc4 *.srv *.svc *.ext *.cksum *.ieg *.log
+	-rm -f *~ *.grb *.nc *.nc2 *.nc4 *.srv *.ext *.cksum *.ieg *.log
 
 .PHONY: clean-local-dirs
 clean-local-dirs:

tests/cksum_write.c

 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include <errno.h>
@@ -104,7 +104,7 @@ static const struct {
   { "nc2", CDI_FILETYPE_NC2, CDI_DATATYPE_FLT64, GRID_LONLAT },
   { "nc4", CDI_FILETYPE_NC4, CDI_DATATYPE_FLT64, GRID_LONLAT },
   { "ext", CDI_FILETYPE_EXT, CDI_DATATYPE_FLT64, GRID_GENERIC, },
-  { "svc", CDI_FILETYPE_SRV, CDI_DATATYPE_FLT64, GRID_GENERIC, },
+  { "srv", CDI_FILETYPE_SRV, CDI_DATATYPE_FLT64, GRID_GENERIC, },
   { "ieg", CDI_FILETYPE_IEG, CDI_DATATYPE_FLT64, GRID_LONLAT },
 };
 #endif

tests/pio_write.c

@@ -48,7 +48,7 @@ static const struct {
   { "nc2", CDI_FILETYPE_NC2, CDI_DATATYPE_FLT64, GRID_LONLAT },
   { "nc4", CDI_FILETYPE_NC4, CDI_DATATYPE_FLT64, GRID_LONLAT },
   { "ext", CDI_FILETYPE_EXT, CDI_DATATYPE_FLT64, GRID_GENERIC, },
-  { "svc", CDI_FILETYPE_SRV, CDI_DATATYPE_FLT64, GRID_GENERIC, },
+  { "srv", CDI_FILETYPE_SRV, CDI_DATATYPE_FLT64, GRID_GENERIC, },
   { "ieg", CDI_FILETYPE_IEG, CDI_DATATYPE_FLT64, GRID_LONLAT },
 };
 

tests/test_cksum_service.in

 #! /bin/sh
 
 set -e
-format=svc
+format=srv
 if [ @ENABLE_SERVICE@ = yes ]; then
   . ${srcdir}/test_cksum_base
 else