Merge declarations with initializations in namespaceAdaptKey.

src/namespace.c

@@ -245,17 +245,12 @@ namespaceGetActive()
 int
 namespaceAdaptKey(int originResH, int originNamespace)
 {
-  namespaceTuple_t tin;
-  int nsp;
-
   if (originResH == CDI_UNDEFID) return CDI_UNDEFID;
 
-  tin.idx = originResH & idxmask;
-  tin.nsp = (int) (((unsigned) (originResH & nspmask)) >> idxbits);
-
+  namespaceTuple_t tin = { .idx = originResH & idxmask, .nsp = (int) (((unsigned) (originResH & nspmask)) >> idxbits) };
   xassert(tin.nsp == originNamespace);
 
-  nsp = namespaceGetActive();
+  int nsp = namespaceGetActive();
 
   return namespaceIdxEncode2(nsp, tin.idx);
 }
@@ -263,16 +258,11 @@ namespaceAdaptKey(int originResH, int originNamespace)
 int
 namespaceAdaptKey2(int originResH)
 {
-  namespaceTuple_t tin;
-  int nsp;
 
   if (originResH == CDI_UNDEFID) return CDI_UNDEFID;
 
-  tin.idx = originResH & idxmask;
-  tin.nsp = (int) (((unsigned) (originResH & nspmask)) >> idxbits);
-
-  nsp = namespaceGetActive();
-
+  namespaceTuple_t tin = { .idx = originResH & idxmask, .nsp = (int) (((unsigned) (originResH & nspmask)) >> idxbits) };
+  int nsp = namespaceGetActive();
   return namespaceIdxEncode2(nsp, tin.idx);
 }