Commit 858666a9 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

replaced uuid[CDI_UUID_SIZE] with *uuid, changed __restrict__ back to restrict

parent e2f7af53
...@@ -32,3 +32,4 @@ void basetimeInit(basetime_t *basetime) ...@@ -32,3 +32,4 @@ void basetimeInit(basetime_t *basetime)
* require-trailing-newline: t * require-trailing-newline: t
* End: * End:
*/ */
\ No newline at end of file
...@@ -842,10 +842,10 @@ void gridDefReference(int gridID, const char *reference); ...@@ -842,10 +842,10 @@ void gridDefReference(int gridID, const char *reference);
int gridInqReference(int gridID, char *reference); int gridInqReference(int gridID, char *reference);
/* gridDefUUID: Define the UUID of an unstructured grid */ /* gridDefUUID: Define the UUID of an unstructured grid */
void gridDefUUID(int gridID, const unsigned char uuid[CDI_UUID_SIZE]); void gridDefUUID(int gridID, const unsigned char *uuid);
/* gridInqUUID: Get the UUID of an unstructured grid */ /* gridInqUUID: Get the UUID of an unstructured grid */
void gridInqUUID(int gridID, unsigned char uuid[CDI_UUID_SIZE]); void gridInqUUID(int gridID, unsigned char *uuid);
/* Lambert Conformal Conic grid (GRIB version) */ /* Lambert Conformal Conic grid (GRIB version) */
...@@ -1097,7 +1097,7 @@ const char *modelInqNamePtr(int modelID); ...@@ -1097,7 +1097,7 @@ const char *modelInqNamePtr(int modelID);
void tableWriteC(const char *filename, int tableID); void tableWriteC(const char *filename, int tableID);
void tableFWriteC(FILE *ptfp, int tableID); void tableFWriteC(FILE *ptfp, int tableID);
void tableWrite(const char *filename, int tableID); void tableWrite(const char *filename, int tableID);
int tableRead(char *tablefile); int tableRead(const char *tablefile);
int tableDef(int modelID, int tablenum, const char *tablename); int tableDef(int modelID, int tablenum, const char *tablename);
const char *tableInqNamePtr(int tableID); const char *tableInqNamePtr(int tableID);
......
...@@ -288,7 +288,7 @@ void gauaw_old(double *pa, double *pw, int nlat) ...@@ -288,7 +288,7 @@ void gauaw_old(double *pa, double *pw, int nlat)
} }
#endif #endif
void gaussaw(double *__restrict__ pa, double *__restrict__ pw, size_t nlat) void gaussaw(double *restrict pa, double *restrict pw, size_t nlat)
{ {
//gauaw_old(pa, pw, nlat); //gauaw_old(pa, pw, nlat);
gauaw(nlat, pa, pw); gauaw(nlat, pa, pw);
......
...@@ -67,7 +67,7 @@ void reshUnpackResources(char * unpackBuffer, int unpackBufferSize, ...@@ -67,7 +67,7 @@ void reshUnpackResources(char * unpackBuffer, int unpackBufferSize,
case STREAM: case STREAM:
if (sizeAssociations == numAssociations) if (sizeAssociations == numAssociations)
associations associations
= xrealloc(associations, = (struct streamAssoc *)xrealloc(associations,
sizeof (associations[0]) * (size_t)(sizeAssociations *= 2)); sizeof (associations[0]) * (size_t)(sizeAssociations *= 2));
associations[numAssociations] associations[numAssociations]
= streamUnpack(unpackBuffer, unpackBufferSize, &unpackBufferPos, = streamUnpack(unpackBuffer, unpackBufferSize, &unpackBufferPos,
......
Markdown is supported
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