Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
ea7291dc
Commit
ea7291dc
authored
Dec 27, 2014
by
Uwe Schulzweida
Browse files
app/cdi: limit length of model string to CDI_MAX_NAME
parent
c4a1bdad
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/cdi.c
View file @
ea7291dc
...
...
@@ -298,14 +298,15 @@ const char* calendar2str(int calendar)
}
static
void
limit_string_length
(
char
*
string
)
void
limit_string_length
(
char
*
string
,
size_t
maxlen
)
{
string
[
maxlen
-
1
]
=
0
;
size_t
len
=
strlen
(
string
);
if
(
len
>
10
)
{
for
(
size_t
i
=
3
;
i
<
len
;
++
i
)
if
(
string
[
i
]
==
' '
)
if
(
string
[
i
]
==
' '
||
string
[
i
]
==
','
||
(
i
>
10
&&
string
[
i
]
==
'.'
)
)
{
string
[
i
]
=
0
;
break
;
...
...
@@ -355,15 +356,15 @@ void printShortinfo(int streamID, int vlistID, int vardis)
/* institute info */
instptr
=
institutInqNamePtr
(
vlistInqVarInstitut
(
vlistID
,
varID
));
strcpy
(
tmpname
,
"unknown"
);
if
(
instptr
)
strcpy
(
tmpname
,
instptr
);
limit_string_length
(
tmpname
);
if
(
instptr
)
str
n
cpy
(
tmpname
,
instptr
,
CDI_MAX_NAME
);
limit_string_length
(
tmpname
,
CDI_MAX_NAME
);
fprintf
(
stdout
,
"%-8s "
,
tmpname
);
/* source info */
modelptr
=
modelInqNamePtr
(
vlistInqVarModel
(
vlistID
,
varID
));
strcpy
(
tmpname
,
"unknown"
);
if
(
modelptr
)
strcpy
(
tmpname
,
modelptr
);
limit_string_length
(
tmpname
);
if
(
modelptr
)
str
n
cpy
(
tmpname
,
modelptr
,
CDI_MAX_NAME
);
limit_string_length
(
tmpname
,
CDI_MAX_NAME
);
fprintf
(
stdout
,
"%-8s "
,
tmpname
);
/* tsteptype */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment