From 381bc61b13d5d76408d580f2f89fbf5ba5a3eedf Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 11 Aug 2008 18:32:42 +0000 Subject: [PATCH] -Change 'undef' to DEFAULT handlers to avoid strict violation warnings git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2010 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/xcatd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 776c8b6b2..5e865e0da 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -520,7 +520,7 @@ until ($quit) { ); alarm(0); }; - undef $SIG{ALRM}; + $SIG{ALRM}='DEFAULT'; if ($@) { #SSL failure close($cnnection); xexit 0; @@ -731,7 +731,7 @@ sub plugin_command { if ($dispatch_requests) { dispatch_request($req,$callback,$modname); } else { - undef $SIG{CHLD}; + $SIG{CHLD}='DEFAULT'; ${"xCAT_plugin::".$modname."::"}{process_request}->($req,$callback,\&do_request); } $$progname=$oldprogname; @@ -851,7 +851,7 @@ sub dispatch_request { #will for now be required for a command to be scaled through service nodes #If the plugin offers a preprocess method, use it to set the request array if (defined(${"xCAT_plugin::".$modname."::"}{preprocess_request})) { - undef $SIG{CHLD}; + $SIG{CHLD}='DEFAULT'; $reqs = ${"xCAT_plugin::".$modname."::"}{preprocess_request}->($req,$dispatch_cb,\&do_request); } else { #otherwise, pass it in without hierarchy support $reqs = [$req]; @@ -870,7 +870,7 @@ sub dispatch_request { my $child; delete $_->{noderange}; if ($onlyone and not ($_->{'_xcatdest'} and thishostisnot($_->{'_xcatdest'}))) { - undef $SIG{CHLD}; + $SIG{CHLD}='DEFAULT'; ${"xCAT_plugin::".$modname."::"}{process_request}->($_,$dispatch_cb,\&do_request); return; } @@ -888,7 +888,7 @@ sub dispatch_request { unless (defined $child) { $dispatch_cb->({error=>['Fork failure dispatching request'],errorcode=>[1]}); } - undef $SIG{CHLD}; + $SIG{CHLD}='DEFAULT'; $dispatch_parentfd = $parfd; if (ref($_->{'_xcatdest'}) eq 'ARRAY') { $_->{'_xcatdest'} = $_->{'_xcatdest'}->[0]; @@ -907,7 +907,7 @@ sub dispatch_request { } } else { $$progname.=": locally executing"; - undef $SIG{CHLD}; + $SIG{CHLD}='DEFAULT'; ${"xCAT_plugin::".$modname."::"}{process_request}->($_,\&dispatch_callback,\&do_request); } xexit;