Commit 4bd7aa1b authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Replace string copying with static string data.

parent 5492bb13
...@@ -1585,7 +1585,6 @@ static ...@@ -1585,7 +1585,6 @@ static
void cdfDefRgrid(stream_t *streamptr, int gridID) void cdfDefRgrid(stream_t *streamptr, int gridID)
{ {
char axisname[7] = "rgridX"; char axisname[7] = "rgridX";
int index, iz = 0;
int dimID = UNDEFID; int dimID = UNDEFID;
int lwarn = TRUE; int lwarn = TRUE;
...@@ -1596,7 +1595,8 @@ void cdfDefRgrid(stream_t *streamptr, int gridID) ...@@ -1596,7 +1595,8 @@ void cdfDefRgrid(stream_t *streamptr, int gridID)
size_t dimlen = (size_t)gridInqSize(gridID); size_t dimlen = (size_t)gridInqSize(gridID);
for ( index = 0; index < ngrids; index++ ) int iz = 0;
for ( int index = 0; index < ngrids; index++ )
{ {
if ( streamptr->xdimID[index] != UNDEFID ) if ( streamptr->xdimID[index] != UNDEFID )
{ {
...@@ -2009,7 +2009,6 @@ void cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID) ...@@ -2009,7 +2009,6 @@ void cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID)
int mlev = ilev - 1; int mlev = ilev - 1;
int hyaiid = 0, hybiid = 0, hyamid, hybmid; int hyaiid = 0, hybiid = 0, hyamid, hybmid;
char tmpname[CDI_MAX_NAME];
if ( streamptr->vct.ilev > 0 ) if ( streamptr->vct.ilev > 0 )
{ {
...@@ -2034,28 +2033,43 @@ void cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID) ...@@ -2034,28 +2033,43 @@ void cdf_def_vct_cf(stream_t *streamptr, int zaxisID, int nclevID, int ncbndsID)
cdf_def_var(fileID, "ap", NC_DOUBLE, 1, dimIDs, &hyamid); cdf_def_var(fileID, "ap", NC_DOUBLE, 1, dimIDs, &hyamid);
cdf_def_var(fileID, "b", NC_DOUBLE, 1, dimIDs, &hybmid); cdf_def_var(fileID, "b", NC_DOUBLE, 1, dimIDs, &hybmid);
strcpy(tmpname, "vertical coordinate formula term: ap(k)"); {
cdf_put_att_text(fileID, hyamid, "long_name", strlen(tmpname), tmpname); static const char lname[] = "vertical coordinate formula term: ap(k)";
strcpy(tmpname, "Pa"); cdf_put_att_text(fileID, hyamid, "long_name", sizeof (lname) - 1, lname);
cdf_put_att_text(fileID, hyamid, "units", strlen(tmpname), tmpname); }
strcpy(tmpname, "vertical coordinate formula term: b(k)"); {
cdf_put_att_text(fileID, hybmid, "long_name", strlen(tmpname), tmpname); static const char units[] = "Pa";
strcpy(tmpname, "1"); cdf_put_att_text(fileID, hyamid, "units", sizeof (units) - 1, units);
cdf_put_att_text(fileID, hybmid, "units", strlen(tmpname), tmpname); }
{
static const char lname[] = "vertical coordinate formula term: b(k)";
cdf_put_att_text(fileID, hybmid, "long_name", sizeof (lname) - 1, lname);
}
{
static const char units[] = "1";
cdf_put_att_text(fileID, hybmid, "units", sizeof (units) - 1, units);
}
if ( ncbndsID != -1 ) if ( ncbndsID != -1 )
{ {
cdf_def_var(fileID, "ap_bnds", NC_DOUBLE, 2, dimIDs, &hyaiid); cdf_def_var(fileID, "ap_bnds", NC_DOUBLE, 2, dimIDs, &hyaiid);
cdf_def_var(fileID, "b_bnds", NC_DOUBLE, 2, dimIDs, &hybiid); cdf_def_var(fileID, "b_bnds", NC_DOUBLE, 2, dimIDs, &hybiid);
{
strcpy(tmpname, "vertical coordinate formula term: ap(k+1/2)"); static const char lname[] = "vertical coordinate formula term: ap(k+1/2)";
cdf_put_att_text(fileID, hyaiid, "long_name", strlen(tmpname), tmpname); cdf_put_att_text(fileID, hyaiid, "long_name", sizeof (lname) - 1, lname);
strcpy(tmpname, "Pa"); }
cdf_put_att_text(fileID, hyaiid, "units", strlen(tmpname), tmpname); {
strcpy(tmpname, "vertical coordinate formula term: b(k+1/2)"); static const char units[] = "Pa";
cdf_put_att_text(fileID, hybiid, "long_name", strlen(tmpname), tmpname); cdf_put_att_text(fileID, hyaiid, "units", sizeof (units) - 1, units);
strcpy(tmpname, "1"); }
cdf_put_att_text(fileID, hybiid, "units", strlen(tmpname), tmpname); {
static const char lname[] = "vertical coordinate formula term: b(k+1/2)";
cdf_put_att_text(fileID, hybiid, "long_name", sizeof (lname) - 1, lname);
}
{
static const char units[] = "1";
cdf_put_att_text(fileID, hybiid, "units", sizeof (units) - 1, units);
}
} }
cdf_enddef(fileID); cdf_enddef(fileID);
......
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