Skip to content
GitLab
Menu
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
308d84cc
Commit
308d84cc
authored
Jul 12, 2011
by
Uwe Schulzweida
Browse files
vlistCat: set varsAllocated to nvars
parent
228586f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/vlist.c
View file @
308d84cc
...
@@ -372,6 +372,7 @@ void vlistCopy(int vlistID2, int vlistID1)
...
@@ -372,6 +372,7 @@ void vlistCopy(int vlistID2, int vlistID1)
int
nvars
=
vlistptr1
->
nvars
;
int
nvars
=
vlistptr1
->
nvars
;
int
nlevs
,
varID
;
int
nlevs
,
varID
;
//vlistptr2->varsAllocated = nvars;
vlistptr2
->
vars
=
(
var_t
*
)
malloc
(
vlistptr2
->
varsAllocated
*
sizeof
(
var_t
));
vlistptr2
->
vars
=
(
var_t
*
)
malloc
(
vlistptr2
->
varsAllocated
*
sizeof
(
var_t
));
memcpy
(
vlistptr2
->
vars
,
vlistptr1
->
vars
,
vlistptr2
->
varsAllocated
*
sizeof
(
var_t
));
memcpy
(
vlistptr2
->
vars
,
vlistptr1
->
vars
,
vlistptr2
->
varsAllocated
*
sizeof
(
var_t
));
...
@@ -725,7 +726,11 @@ void vlistCat(int vlistID2, int vlistID1)
...
@@ -725,7 +726,11 @@ void vlistCat(int vlistID2, int vlistID1)
nvars
=
nvars1
+
nvars2
;
nvars
=
nvars1
+
nvars2
;
vlistptr2
->
nvars
=
nvars
;
vlistptr2
->
nvars
=
nvars
;
vlistptr2
->
vars
=
(
var_t
*
)
realloc
(
vlistptr2
->
vars
,
nvars
*
sizeof
(
var_t
));
if
(
nvars
>
vlistptr2
->
varsAllocated
)
{
vlistptr2
->
varsAllocated
=
nvars
;
vlistptr2
->
vars
=
(
var_t
*
)
realloc
(
vlistptr2
->
vars
,
nvars
*
sizeof
(
var_t
));
}
memcpy
(
vlistptr2
->
vars
+
nvars2
,
vlistptr1
->
vars
,
nvars1
*
sizeof
(
var_t
));
memcpy
(
vlistptr2
->
vars
+
nvars2
,
vlistptr1
->
vars
,
nvars1
*
sizeof
(
var_t
));
for
(
varID
=
0
;
varID
<
nvars1
;
varID
++
)
for
(
varID
=
0
;
varID
<
nvars1
;
varID
++
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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