Skip to content
Snippets Groups Projects
Commit 315cf517 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

Use unsigned for namespace counts.

parent 4d9e79ae
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "cdi_int.h" #include "cdi_int.h"
#include "stream_cdf.h" #include "stream_cdf.h"
static int nNamespaces = 1; static unsigned nNamespaces = 1;
static int activeNamespace = 0; static int activeNamespace = 0;
#ifdef HAVE_LIBNETCDF #ifdef HAVE_LIBNETCDF
...@@ -72,7 +72,7 @@ static struct Namespace ...@@ -72,7 +72,7 @@ static struct Namespace
static struct Namespace *namespaces = &initialNamespace; static struct Namespace *namespaces = &initialNamespace;
static int namespacesSize = 1; static unsigned namespacesSize = 1;
#if defined (HAVE_LIBPTHREAD) #if defined (HAVE_LIBPTHREAD)
# include <pthread.h> # include <pthread.h>
...@@ -151,10 +151,10 @@ namespaceNew() ...@@ -151,10 +151,10 @@ namespaceNew()
if (namespacesSize > nNamespaces) if (namespacesSize > nNamespaces)
{ {
/* namespace is already available and only needs reinitialization */ /* namespace is already available and only needs reinitialization */
for (int i = 0; i < namespacesSize; ++i) for (unsigned i = 0; i < namespacesSize; ++i)
if (namespaces[i].resStage == STAGE_UNUSED) if (namespaces[i].resStage == STAGE_UNUSED)
{ {
newNamespaceID = i; newNamespaceID = (int)i;
break; break;
} }
} }
...@@ -171,7 +171,7 @@ namespaceNew() ...@@ -171,7 +171,7 @@ namespaceNew()
else if (namespacesSize < NUM_NAMESPACES) else if (namespacesSize < NUM_NAMESPACES)
{ {
/* make room for additional namespace */ /* make room for additional namespace */
newNamespaceID = namespacesSize; newNamespaceID = (int)namespacesSize;
namespaces namespaces
= (struct Namespace *)xrealloc(namespaces, ((size_t)namespacesSize + 1) * sizeof (namespaces[0])); = (struct Namespace *)xrealloc(namespaces, ((size_t)namespacesSize + 1) * sizeof (namespaces[0]));
++namespacesSize; ++namespacesSize;
...@@ -203,7 +203,8 @@ namespaceDelete(int namespaceID) ...@@ -203,7 +203,8 @@ namespaceDelete(int namespaceID)
{ {
NAMESPACE_INIT(); NAMESPACE_INIT();
NAMESPACE_LOCK(); NAMESPACE_LOCK();
xassert(namespaceID < namespacesSize && nNamespaces); xassert(namespaceID >= 0 && (unsigned)namespaceID < namespacesSize
&& nNamespaces);
reshListDestruct(namespaceID); reshListDestruct(namespaceID);
namespaces[namespaceID].resStage = STAGE_UNUSED; namespaces[namespaceID].resStage = STAGE_UNUSED;
--nNamespaces; --nNamespaces;
...@@ -212,13 +213,13 @@ namespaceDelete(int namespaceID) ...@@ -212,13 +213,13 @@ namespaceDelete(int namespaceID)
int namespaceGetNumber () int namespaceGetNumber ()
{ {
return nNamespaces; return (int)nNamespaces;
} }
void namespaceSetActive ( int nId ) void namespaceSetActive ( int nId )
{ {
xassert(nId < namespacesSize && nId >= 0 xassert((unsigned)nId < namespacesSize
&& namespaces[nId].resStage != STAGE_UNUSED); && namespaces[nId].resStage != STAGE_UNUSED);
activeNamespace = nId; activeNamespace = nId;
} }
...@@ -294,9 +295,9 @@ void cdiReset(void) ...@@ -294,9 +295,9 @@ void cdiReset(void)
{ {
NAMESPACE_INIT(); NAMESPACE_INIT();
NAMESPACE_LOCK(); NAMESPACE_LOCK();
for (int namespaceID = 0; namespaceID < namespacesSize; ++namespaceID) for (unsigned namespaceID = 0; namespaceID < namespacesSize; ++namespaceID)
if (namespaces[namespaceID].resStage != STAGE_UNUSED) if (namespaces[namespaceID].resStage != STAGE_UNUSED)
namespaceDelete(namespaceID); namespaceDelete((int)namespaceID);
if (namespaces != &initialNamespace) if (namespaces != &initialNamespace)
{ {
free(namespaces); free(namespaces);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment