Changeset: 0f63ad18eebe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f63ad18eebe
Modified Files:
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_authorize.h
        monetdb5/modules/mal/remote.c
Branch: remote_auth
Log Message:

Remove unused parameter


diffs (53 lines):

diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -991,15 +991,13 @@ lookupRemoteTableKey(const char *key)
 }
 
 str
-AUTHgetRemoteTableCredentials(const char *local_table, Client cntxt, str *uri, 
str *username, str *password)
+AUTHgetRemoteTableCredentials(const char *local_table, str *uri, str 
*username, str *password)
 {
        BUN p;
        BATiter i;
        str tmp;
        str pwhash;
 
-       (void)cntxt;
-
        if (local_table == NULL || strNil(local_table)) {
                throw(ILLARG, "getRemoteTableCredentials", "local table should 
not be nil");
        }
diff --git a/monetdb5/mal/mal_authorize.h b/monetdb5/mal/mal_authorize.h
--- a/monetdb5/mal/mal_authorize.h
+++ b/monetdb5/mal/mal_authorize.h
@@ -28,8 +28,7 @@ mal_export str AUTHgetPasswordHash(str *
 mal_export str AUTHinitTables(const char *passwd);
 
 mal_export str AUTHaddRemoteTableCredentials(const char *local_table, const 
char *localuser, const char *uri, const char *remoteuser, const char *pass, 
bool pw_encrypted);
-mal_export str AUTHgetRemoteTableCredentials(const char *local_table, Client 
cntxt, str *uri, str *username, str *password);
-
+mal_export str AUTHgetRemoteTableCredentials(const char *local_table, str 
*uri, str *username, str *password);
 
 /*
  * Authorisation is based on a password.  The passwords are stored hashed
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -271,6 +271,7 @@ RMTconnectTable(Client cntxt, MalBlkPtr 
        ValPtr v;
 
        (void)mb;
+       (void)cntxt;
 
        local_table = *getArgReference_str(stk, pci, 1);
        scen = *getArgReference_str(stk, pci, 2);
@@ -278,7 +279,7 @@ RMTconnectTable(Client cntxt, MalBlkPtr 
                throw(ILLARG, "remote.connect", ILLEGAL_ARGUMENT ": local table 
is NULL or nil");
        }
 
-       rethrow("remote.connect", tmp, 
AUTHgetRemoteTableCredentials(local_table, cntxt, &uri, &remoteuser, &passwd));
+       rethrow("remote.connect", tmp, 
AUTHgetRemoteTableCredentials(local_table, &uri, &remoteuser, &passwd));
 
        /* The password we just got is hashed. Add the byte \1 in front to
         * signal this fact to the mapi. */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to