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 @@ -2854,9 +2854,9 @@ void apply_push_cas(struct push_cas_option *cas,
2854
2854
2855
2855
struct remote_state * remote_state_new (void )
2856
2856
{
2857
- struct remote_state * r = xmalloc ( sizeof ( * r )) ;
2857
+ struct remote_state * r ;
2858
2858
2859
- memset (r , 0 , sizeof ( * r ) );
2859
+ CALLOC_ARRAY (r , 1 );
2860
2860
2861
2861
hashmap_init (& r -> remotes_hash , remotes_hash_cmp , NULL , 0 );
2862
2862
hashmap_init (& r -> branches_hash , branches_hash_cmp , NULL , 0 );
Original file line number Diff line number Diff line change @@ -1489,14 +1489,13 @@ struct fetch_task {
1489
1489
*/
1490
1490
static const struct submodule * get_non_gitmodules_submodule (const char * path )
1491
1491
{
1492
- struct submodule * ret = NULL ;
1492
+ struct submodule * ret ;
1493
1493
const char * name = default_name_or_path (path );
1494
1494
1495
1495
if (!name )
1496
1496
return NULL ;
1497
1497
1498
- ret = xmalloc (sizeof (* ret ));
1499
- memset (ret , 0 , sizeof (* ret ));
1498
+ CALLOC_ARRAY (ret , 1 );
1500
1499
ret -> path = name ;
1501
1500
ret -> name = name ;
1502
1501
@@ -1536,8 +1535,9 @@ static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf
1536
1535
const char * path ,
1537
1536
const struct object_id * treeish_name )
1538
1537
{
1539
- struct fetch_task * task = xmalloc (sizeof (* task ));
1540
- memset (task , 0 , sizeof (* task ));
1538
+ struct fetch_task * task ;
1539
+
1540
+ CALLOC_ARRAY (task , 1 );
1541
1541
1542
1542
if (validate_submodule_path (path ) < 0 )
1543
1543
exit (128 );
You can’t perform that action at this time.
0 commit comments