File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -2879,9 +2879,9 @@ void apply_push_cas(struct push_cas_option *cas,
28792879
28802880struct remote_state * remote_state_new (void )
28812881{
2882- struct remote_state * r = xmalloc ( sizeof ( * r )) ;
2882+ struct remote_state * r ;
28832883
2884- memset (r , 0 , sizeof ( * r ) );
2884+ CALLOC_ARRAY (r , 1 );
28852885
28862886 hashmap_init (& r -> remotes_hash , remotes_hash_cmp , NULL , 0 );
28872887 hashmap_init (& r -> branches_hash , branches_hash_cmp , NULL , 0 );
Original file line number Diff line number Diff line change @@ -1490,14 +1490,13 @@ struct fetch_task {
14901490 */
14911491static const struct submodule * get_non_gitmodules_submodule (const char * path )
14921492{
1493- struct submodule * ret = NULL ;
1493+ struct submodule * ret ;
14941494 const char * name = default_name_or_path (path );
14951495
14961496 if (!name )
14971497 return NULL ;
14981498
1499- ret = xmalloc (sizeof (* ret ));
1500- memset (ret , 0 , sizeof (* ret ));
1499+ CALLOC_ARRAY (ret , 1 );
15011500 ret -> path = name ;
15021501 ret -> name = name ;
15031502
@@ -1537,8 +1536,9 @@ static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf
15371536 const char * path ,
15381537 const struct object_id * treeish_name )
15391538{
1540- struct fetch_task * task = xmalloc (sizeof (* task ));
1541- memset (task , 0 , sizeof (* task ));
1539+ struct fetch_task * task ;
1540+
1541+ CALLOC_ARRAY (task , 1 );
15421542
15431543 if (validate_submodule_path (path ) < 0 )
15441544 exit (128 );
You can’t perform that action at this time.
0 commit comments