hds-v4: Add a version identifier to the HDSLoc struct

This allows a future HDS wrapper to be able to quickly work out that this is a v4 locator.
Starlink · Oct 31, 2014 · 0e25d05 · 0e25d05
1 parent e752059
commit 0e25d05
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/libraries/hds-v4/component.xml b/libraries/hds-v4/component.xml
@@ -3,7 +3,7 @@
 <!-- component.xml.  Generated from component.xml.in by configure. -->
 
 <component id="hds-v4" support="S">
-  <version>5.1-1</version>
+  <version>5.2-1</version>
   <path>libraries/hds-v4</path>
   <description>Hierarchical Data System Version 4</description>
   <abstract>

diff --git a/libraries/hds-v4/configure.ac b/libraries/hds-v4/configure.ac
@@ -2,7 +2,7 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT([hds-v4],[5.1-1],[starlink@jiscmail.ac.uk])
+AC_INIT([hds-v4],[5.2-1],[starlink@jiscmail.ac.uk])
 AC_CONFIG_AUX_DIR([build-aux])
 
 dnl    Require autoconf-2.50 at least

diff --git a/libraries/hds-v4/dat1.h b/libraries/hds-v4/dat1.h
@@ -309,6 +309,7 @@ if (!_ok(*status))\
 /* LOC - Locator.							    */
       struct LOC
       {
+         int hds_version;        /* HDS implementation version number      */
          struct LCP *lcp;	 /* Address of Locator Control Packet	    */
          unsigned int check;	 /* Validity check			    */
          unsigned int seqno;	 /* Sequence number			    */

diff --git a/libraries/hds-v4/dat1_alloc_lcp.c b/libraries/hds-v4/dat1_alloc_lcp.c
@@ -122,6 +122,7 @@
 /* Initialise the locator information, including the locator sequence       */
 /* number which is duplicated in the LCP.                                   */
 	 if (rec_alloc_mem( sizeof(struct LOC), (void**)loc ) == DAT__OK) {
+           (*loc)->hds_version = 4;
 	   (*loc)->check = DAT__LOCCHECK;
 	   (*loc)->lcp = *lcp;
 	   (*loc)->seqno = (*lcp)->seqno = ++hds_gl_locseq;