[Pkg-privacy-commits] [irssi-plugin-otr] 118/267: Rename variable in cmd.c

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit df941dc117622d484a0962102a0261af28629f72
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Wed Nov 7 23:18:10 2012 -0500

    Rename variable in cmd.c
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/cmd.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/cmd.c b/src/cmd.c
index 6a23985..ef26176 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -24,7 +24,7 @@
 /*
  * /otr debug
  */
-static void _cmd_debug(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_debug(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	debug = !debug;
@@ -34,7 +34,7 @@ static void _cmd_debug(struct otr_user_state *ioustate, IRC_CTX *ircctx, int arg
 /*
  * /otr version 
  */
-static void _cmd_version(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_version(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	otr_noticest(TXT_CMD_VERSION, IRCOTR_VERSION);
@@ -43,7 +43,7 @@ static void _cmd_version(struct otr_user_state *ioustate, IRC_CTX *ircctx, int a
 /*
  * /otr help 
  */
-static void _cmd_help(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_help(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	otr_log(ircctx, target, MSGLEVEL_CRAP, otr_help);
@@ -52,7 +52,7 @@ static void _cmd_help(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc
 /*
  * /otr finish 
  */
-static void _cmd_finish(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_finish(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	if (argc) {
@@ -67,7 +67,7 @@ static void _cmd_finish(struct otr_user_state *ioustate, IRC_CTX *ircctx, int ar
 /*
  * /otr trust
  */
-static void _cmd_trust(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_trust(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	if (argc) {
@@ -82,7 +82,7 @@ static void _cmd_trust(struct otr_user_state *ioustate, IRC_CTX *ircctx, int arg
 /*
  * /otr authabort
  */
-static void _cmd_authabort(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc,
+static void _cmd_authabort(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc,
 		char *argv[], char *argv_eol[], char *target, const char *orig_args)
 {
 	if (argc) {
@@ -97,14 +97,14 @@ static void _cmd_authabort(struct otr_user_state *ioustate, IRC_CTX *ircctx, int
 /*
  * /otr genkey
  */
-static void _cmd_genkey(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_genkey(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	if (argc) {
 		if (strncmp(argv[0], "abort", strlen("abort")) == 0) {
-			key_generation_abort(ioustate, FALSE);
+			key_generation_abort(ustate, FALSE);
 		} else if (strchr(argv[0], '@')) {
-			key_generation_run(ioustate, argv[0]);
+			key_generation_run(ustate, argv[0]);
 		} else {
 			otr_noticest(TXT_KG_NEEDACC);
 		}
@@ -116,7 +116,7 @@ static void _cmd_genkey(struct otr_user_state *ioustate, IRC_CTX *ircctx, int ar
 /*
  * Generic internal function for /otr auth command.
  */
-static void _auth(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc,
+static void _auth(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc,
 		char *argv[], char *argv_eol[], char *target, int qanda,
 		const char *orig_args)
 {
@@ -166,28 +166,28 @@ end:
 /*
  * /otr authq (Authentication with a question)
  */
-static void _cmd_authq(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc,
+static void _cmd_authq(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc,
 		char *argv[], char *argv_eol[], char *target, const char *orig_args)
 {
-	_auth(ioustate, ircctx, argc, argv, argv_eol, target, TRUE, orig_args);
+	_auth(ustate, ircctx, argc, argv, argv_eol, target, TRUE, orig_args);
 }
 
 /*
  * /otr auth
  */
-static void _cmd_auth(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+static void _cmd_auth(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
-	_auth(ioustate, ircctx, argc, argv, argv_eol, target, FALSE, orig_args);
+	_auth(ustate, ircctx, argc, argv, argv_eol, target, FALSE, orig_args);
 }
 
 /*
  * /otr contexts
  */
-static void _cmd_contexts(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc,
+static void _cmd_contexts(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc,
 		char *argv[], char *argv_eol[], char *target, const char *orig_args)
 {
-	struct ctxlist_ *ctxlist = otr_contexts(ioustate), *ctxnext = ctxlist;
+	struct ctxlist_ *ctxlist = otr_contexts(ustate), *ctxnext = ctxlist;
 	struct fplist_ *fplist, *fpnext;
 
 	if (!ctxlist) {
@@ -217,7 +217,7 @@ static void _cmd_contexts(struct otr_user_state *ioustate, IRC_CTX *ircctx, int
 	}
 }
 
-static void _cmd_init(struct otr_user_state *ioustate, SERVER_REC *irssi, int argc,
+static void _cmd_init(struct otr_user_state *ustate, SERVER_REC *irssi, int argc,
 		char *argv[], char *argv_eol[], char *target, const char *orig_args)
 {
 	char *msg;
@@ -263,7 +263,7 @@ static struct irssi_commands cmds[] = {
  *
  * Return TRUE if command exist and is executed else FALSE.
  */
-int cmd_generic(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char *argv[],
+int cmd_generic(struct otr_user_state *ustate, IRC_CTX *ircctx, int argc, char *argv[],
 		char *argv_eol[], char *target, const char *orig_args)
 {
 	char *cmd;
@@ -282,7 +282,7 @@ int cmd_generic(struct otr_user_state *ioustate, IRC_CTX *ircctx, int argc, char
 
 	do {
 		if (strcmp(commands->name, cmd) == 0) {
-			commands->func(ioustate, ircctx, argc, argv, argv_eol, target,
+			commands->func(ustate, ircctx, argc, argv, argv_eol, target,
 					orig_args);
 			goto done;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git