From 9b4a8ccb520889a1b7d844293bd2b33814757aa8 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 1 May 2012 18:28:28 +0000 Subject: [PATCH] Correct syntax problems in invoking fcntl calls git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12426 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Client.pm | 3 +-- xCAT-server/sbin/xcatd | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm index f5837ca0e..240cac341 100644 --- a/perl-xCAT/xCAT/Client.pm +++ b/perl-xCAT/xCAT/Client.pm @@ -224,8 +224,7 @@ $request->{clienttype}->[0] = "cli"; # setup clienttype for auditlog my $massresponse=""; my $nextcoalescetime=time()+1; my $coalescenow=0; - my $flags; - fcntl($client,F_GETFL,$flags); + my $flags=fcntl($client,F_GETFL,0); $flags |= O_NONBLOCK; #select can be a bit.. fickle, make sysread work more easily... fcntl($client,F_SETFL,$flags); my $clientsel = new IO::Select; diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 87f8c85b3..c593b6f5f 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -1687,8 +1687,7 @@ sub service_connection { my $request; my $req=undef; my $line; - my $flags; - fcntl($sock,F_GETFL,$flags); + my $flags=fcntl($sock,F_GETFL,0); $flags |= O_NONBLOCK; #we want sysread to bail on us, select seems to be evil to us still.. fcntl($sock,F_SETFL,$flags); my $clientsel = new IO::Select;