Commit aced0056 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Use strcmp for comparison of grid string members.

parent ebfd891c
...@@ -2206,8 +2206,8 @@ int gridCompareP ( void * gridptr1, void * gridptr2 ) ...@@ -2206,8 +2206,8 @@ int gridCompareP ( void * gridptr1, void * gridptr2 )
{ {
grid_t * g1 = ( grid_t * ) gridptr1; grid_t * g1 = ( grid_t * ) gridptr1;
grid_t * g2 = ( grid_t * ) gridptr2; grid_t * g2 = ( grid_t * ) gridptr2;
int differ = -1; enum { equal = 0,
int equal = 0; differ = -1 };
int i, size; int i, size;
xassert ( g1 ); xassert ( g1 );
...@@ -2350,14 +2350,14 @@ int gridCompareP ( void * gridptr1, void * gridptr2 ) ...@@ -2350,14 +2350,14 @@ int gridCompareP ( void * gridptr1, void * gridptr2 )
else if ( g2->ybounds ) else if ( g2->ybounds )
return differ; return differ;
if ( memcmp ( &g1->xname ,&g2->xname ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->xname, g2->xname)) return differ;
if ( memcmp ( &g1->yname ,&g2->yname ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->yname, g2->yname)) return differ;
if ( memcmp ( &g1->xlongname,&g2->xlongname,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->xlongname, g2->xlongname)) return differ;
if ( memcmp ( &g1->ylongname,&g2->ylongname,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->ylongname, g2->ylongname)) return differ;
if ( memcmp ( &g1->xstdname ,&g2->xstdname ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->xstdname, g2->xstdname)) return differ;
if ( memcmp ( &g1->ystdname ,&g2->ystdname ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->ystdname, g2->ystdname)) return differ;
if ( memcmp ( &g1->xunits ,&g2->xunits ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->xunits, g2->xunits)) return differ;
if ( memcmp ( &g1->yunits ,&g2->yunits ,CDI_MAX_NAME ) ) return differ; if (strcmp(g1->yunits, g2->yunits)) return differ;
if ( g1->reference ) if ( g1->reference )
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment