Make git_cred_ssh_custom_new() naming more consistent

jacquesg · jacquesg · commit 8ec0a5527333 · 2014-04-18T17:58:25.000+02:00
diff --git a/include/git2/transport.h b/include/git2/transport.h
@@ -99,7 +99,7 @@ typedef struct git_cred_ssh_custom {
 	char *publickey;
 	size_t publickey_len;
 	void *sign_callback;
-	void *sign_data;
+	void *payload;
 } git_cred_ssh_custom;
 
 /** A key for NTLM/Kerberos "default" credentials */
@@ -186,17 +186,17 @@ GIT_EXTERN(int) git_cred_ssh_key_from_agent(
  * @param username username to use to authenticate
  * @param publickey The bytes of the public key.
  * @param publickey_len The length of the public key in bytes.
- * @param sign_fn The callback method to sign the data during the challenge.
- * @param sign_data The data to pass to the sign function.
+ * @param sign_callback The callback method to sign the data during the challenge.
+ * @param payload Additional data to pass to the callback.
  * @return 0 for success or an error code for failure
  */
 GIT_EXTERN(int) git_cred_ssh_custom_new(
 	git_cred **out,
 	const char *username,
 	const char *publickey,
 	size_t publickey_len,
-	git_cred_sign_callback sign_fn,
-	void *sign_data);
+	git_cred_sign_callback sign_callback,
+	void *payload);
 
 /**
  * Create a "default" credential usable for Negotiate mechanisms like NTLM
diff --git a/src/transports/cred.c b/src/transports/cred.c
@@ -204,7 +204,7 @@ int git_cred_ssh_custom_new(
 	const char *publickey,
 	size_t publickey_len,
 	git_cred_sign_callback sign_callback,
-	void *sign_data)
+	void *payload)
 {
 	git_cred_ssh_custom *c;
 
@@ -228,7 +228,7 @@ int git_cred_ssh_custom_new(
 
 	c->publickey_len = publickey_len;
 	c->sign_callback = sign_callback;
-	c->sign_data = sign_data;
+	c->payload = payload;
 
 	*cred = &c->parent;
 	return 0;
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
@@ -310,7 +310,7 @@ static int _git_ssh_authenticate_session(
 
 			rc = libssh2_userauth_publickey(
 				session, c->username, (const unsigned char *)c->publickey,
-				c->publickey_len, c->sign_callback, &c->sign_data);
+				c->publickey_len, c->sign_callback, &c->payload);
 			break;
 		}
 		case GIT_CREDTYPE_SSH_INTERACTIVE: {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ static int _git_ssh_authenticate_session(`
`310`	`310`
`311`	`311`	`rc = libssh2_userauth_publickey(`
`312`	`312`	`session, c->username, (const unsigned char *)c->publickey,`
`313`		`- c->publickey_len, c->sign_callback, &c->sign_data);`
	`313`	`+ c->publickey_len, c->sign_callback, &c->payload);`
`314`	`314`	`break;`
`315`	`315`	`}`
`316`	`316`	`case GIT_CREDTYPE_SSH_INTERACTIVE: {`