@@ -539,7 +539,7 @@ void output_cgroup_stats_v2(double *cputime)
539
539
while (ret == 0 ) {
540
540
verbose (" cpu.stat: %s = %s" , stat.name , stat.value );
541
541
if (strcmp (stat.name , " usage_usec" ) == 0 ) {
542
- long long usec = strtoll (stat.value , NULL , 10 );
542
+ long long usec = strtoll (stat.value , nullptr , 10 );
543
543
*cputime = usec / 1e6 ;
544
544
}
545
545
ret = cgroup_read_stats_next (&handle, &stat);
@@ -899,7 +899,7 @@ void setrestrictions()
899
899
900
900
/* Put the child process in the cgroup */
901
901
if (is_cgroup_v2) {
902
- const char *controllers[] = { " memory" , NULL };
902
+ const char *controllers[] = { " memory" , nullptr };
903
903
if (cgroup_change_cgroup_path (cgroupname, getpid (), controllers) != 0 ) {
904
904
error (0 , " Failed to move the process to the cgroup" );
905
905
}
@@ -948,7 +948,7 @@ void setrestrictions()
948
948
/* Set group-id (must be root for this, so before setting user). */
949
949
if ( use_group ) {
950
950
if ( setgid (rungid) ) error (errno," cannot set group ID to `%d'" ,rungid);
951
- if ( setgroups (0 , NULL ) ) error (errno," cannot clear auxiliary groups" );
951
+ if ( setgroups (0 , nullptr ) ) error (errno," cannot clear auxiliary groups" );
952
952
953
953
verbose (" using group ID `%d'" ,rungid);
954
954
}
@@ -1114,7 +1114,7 @@ int main(int argc, char **argv)
1114
1114
case ' u' : /* user option: uid or string */
1115
1115
use_user = 1 ;
1116
1116
runuser = strdup (optarg);
1117
- if ( runuser==NULL ) error (errno," strdup() failed" );
1117
+ if ( runuser==nullptr ) error (errno," strdup() failed" );
1118
1118
errno = 0 ;
1119
1119
runuid = strtol (optarg,&ptr,10 );
1120
1120
if ( errno || *ptr!=' \0 ' ) {
@@ -1131,7 +1131,7 @@ int main(int argc, char **argv)
1131
1131
case ' g' : /* group option: gid or string */
1132
1132
use_group = 1 ;
1133
1133
rungroup = strdup (optarg);
1134
- if ( rungroup==NULL ) error (errno," strdup() failed" );
1134
+ if ( rungroup==nullptr ) error (errno," strdup() failed" );
1135
1135
errno = 0 ;
1136
1136
rungid = strtol (optarg,&ptr,10 );
1137
1137
if ( errno || *ptr!=' \0 ' ) rungid = groupid (optarg);
@@ -1486,7 +1486,7 @@ int main(int argc, char **argv)
1486
1486
}
1487
1487
}
1488
1488
1489
- int r = pselect (nfds+1 , &readfds, nullptr , NULL , NULL , &emptymask);
1489
+ int r = pselect (nfds+1 , &readfds, nullptr , nullptr , nullptr , &emptymask);
1490
1490
if ( r==-1 && errno!=EINTR ) error (errno," waiting for child data" );
1491
1491
if (error_in_signalhandler) {
1492
1492
error (errno, " error in signal handler, exiting" );
0 commit comments