[LON-CAPA-cvs] cvs: loncom / lond

[foxr]

foxr		Tue Jun  1 05:58:31 2004 EDT

  Modified files:              
    /loncom	lond 
  Log:
  Make parameter passing/receiving match Guy's desires for multiple arguments
  (use @_ not multiple shifts).
  
  
Index: loncom/lond
diff -u loncom/lond:1.191 loncom/lond:1.192
--- loncom/lond:1.191	Thu May 20 14:17:12 2004
+++ loncom/lond	Tue Jun  1 05:58:30 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.191 2004/05/20 18:17:12 albertel Exp $
+# $Id: lond,v 1.192 2004/06/01 09:58:30 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.191 $'; #' stupid emacs
+my $VERSION='$Revision: 1.192 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -225,8 +225,8 @@
 #     1   - Success.
 #
 sub CopyFile {
-    my $oldfile = shift;
-    my $newfile = shift;
+
+    my ($oldfile, $newfile) = @_;
 
     #  The file must exist:
 
@@ -326,8 +326,8 @@
 #      0       - failure and $! has an errno.
 #
 sub InstallFile {
-    my $Filename = shift;
-    my $Contents = shift;
+
+    my ($Filename, $Contents) = @_;
     my $TempFile = $Filename.".tmp";
 
     #  Open the file for write:
@@ -564,8 +564,8 @@
 #                  file being edited.
 #
 sub ApplyEdit {
-    my $directive   = shift;
-    my $editor      = shift;
+
+    my ($directive, $editor) = @_;
 
     # Break the directive down into its command and its parameters
     # (at most two at this point.  The meaning of the parameters, if in fact
@@ -649,8 +649,8 @@
 #        editor     - Editor containing the file.
 #
 sub ReplaceConfigFile {
-    my $filename  = shift;
-    my $editor    = shift;
+    
+    my ($filename, $editor) = @_;
 
     CopyFile ($filename, $filename.".old");
 
@@ -1015,9 +1015,8 @@
 #     request - Original request from client.
 #
 sub Reply {
-    my $fd      = shift;
-    my $reply   = shift;
-    my $request = shift;
+
+    my ($fd, $reply, $request) = @_;
 
     print $fd $reply;
     Debug("Request was $request  Reply was $reply");
@@ -2910,10 +2909,8 @@
 #
 sub ManagePermissions
 {
-    my $request = shift;
-    my $domain  = shift;
-    my $user    = shift;
-    my $authtype= shift;
+
+    my ($request, $domain, $user, $authtype) = @_;
 
     # See if the request is of the form /$domain/_au
     if($request =~ /^(\/$domain\/_au)$/) { # It's an author rolesput...
@@ -2930,8 +2927,8 @@
 #
 sub GetAuthType 
 {
-    my $domain = shift;
-    my $user   = shift;
+
+    my ($domain, $user)  = @_;
 
     Debug("GetAuthType( $domain, $user ) \n");
     my $proname    = &propath($domain, $user);