[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-03-18 06:20:05
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-03-18 06:19:53 UTC Modified files: ChangeLog.X3 src/chanserv.c src/helpfile.c src/modcmd.c src/modcmd.h Log message: fixing spelling for reed ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.10 x3/ChangeLog.X3:1.11 --- x3/ChangeLog.X3:1.10 Thu Mar 17 12:18:28 2005 +++ x3/ChangeLog.X3 Thu Mar 17 22:19:43 2005 @@ -1,8 +1,13 @@ /*********************************************************************** X3 ChangeLog +2005-03-18 Alex Schumann <ru...@af...> + + * Changed breef to brief... + 2005-03-17 Alex Schumann <ru...@af...> + * src/opserv.c: Improved readability of trace print output * src/chanserv.c: Improved cmd_list_users output & cleaned it up @@ -55,5 +60,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.10 $" +#define CVS_VERSION "$Revision: 1.11 $" Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.17 x3/src/chanserv.c:1.18 --- x3/src/chanserv.c:1.17 Thu Mar 17 12:18:29 2005 +++ x3/src/chanserv.c Thu Mar 17 22:19:43 2005 @@ -467,7 +467,7 @@ #define CSFUNC_ARGS user, channel, argc, argv, cmd #define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME) -#define CHANSERV_SYNTAX() svccmd_send_help_breef(user, chanserv, cmd) +#define CHANSERV_SYNTAX() svccmd_send_help_brief(user, chanserv, cmd) #define REQUIRE_PARAMS(N) if(argc < (N)) { \ reply("MSG_MISSING_PARAMS", argv[0]); \ CHANSERV_SYNTAX(); \ @@ -1756,7 +1756,7 @@ if(argc < 2) { reply("MSG_MISSING_PARAMS", cmd->name); - svccmd_send_help_breef(user, chanserv, cmd); + svccmd_send_help_brief(user, chanserv, cmd); return 0; } if(!IsChannelName(argv[1])) Index: x3/src/helpfile.c diff -u x3/src/helpfile.c:1.5 x3/src/helpfile.c:1.6 --- x3/src/helpfile.c:1.5 Thu Mar 17 12:18:29 2005 +++ x3/src/helpfile.c Thu Mar 17 22:19:43 2005 @@ -352,13 +352,13 @@ line[pos++] = ' '; memcpy(line+pos, table.contents[0][jj], len); pos += len; + line[pos++] = '\02'; /* end bold header */ if (++jj == table.width) break; if (!(table.flags & TABLE_PAD_LEFT)) while (spaces--) line[pos++] = ' '; line[pos++] = ' '; - line[pos++] = '\02'; /* end bold header */ } } line[pos] = 0; @@ -733,29 +733,6 @@ return res; } - -/* -int -_send_help_breef(struct userNode *dest, struct userNode *src, expand_func_t expand, const char *format, ...) -{ - int res; - char* buf; - char* ptr; - va_list ap; - - buf = (char *) malloc(strlen(format) +1); - strcpy(buf, format); - ptr = strchr(buf, '\n'); - *ptr = '\0'; - va_start(ap, buf); - res = vsend_message(dest->nick, src, dest->handle_info, 12, expand, buf, ap); - va_end(ap); - free(buf); - return res; -} -*/ - - int send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic) { @@ -788,7 +765,7 @@ } int -send_help_breef(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic) +send_help_brief(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic) { struct helpfile *lang_hf; struct record_data *rec; Index: x3/src/modcmd.c diff -u x3/src/modcmd.c:1.11 x3/src/modcmd.c:1.12 --- x3/src/modcmd.c:1.11 Tue Mar 15 21:16:51 2005 +++ x3/src/modcmd.c Thu Mar 17 22:19:43 2005 @@ -721,7 +721,7 @@ } if (argc < cmd->command->min_argc) { send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name); - svccmd_send_help_breef(user, service->bot, cmd); + svccmd_send_help_brief(user, service->bot, cmd); return 0; } if (!cmd->command->func) { @@ -785,7 +785,7 @@ } int -svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd) { +svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd) { char cmdname[MAXLEN]; unsigned int nn; int r; @@ -800,7 +800,7 @@ * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name); * TODO: We actually DO want to show the parent IF there is no other help. */ - r = send_help_breef(user, bot, cmd->command->parent->helpfile, cmd->name); + r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->name); return r; } Index: x3/src/modcmd.h diff -u x3/src/modcmd.h:1.3 x3/src/modcmd.h:1.4 --- x3/src/modcmd.h:1.3 Tue Mar 15 21:16:52 2005 +++ x3/src/modcmd.h Thu Mar 17 22:19:43 2005 @@ -167,8 +167,8 @@ int svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd); /* .. and if somebody doesn't have a modcmd handy .. */ int svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic); -/* Send breef help for a command to a user. */ -int svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd); +/* Send brief help for a command to a user. */ +int svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd); /* Check whether a user may invoke a command or not. If they can, * return non-zero. If they cannot (and noisy is non-zero), tell them * why not and return 0. ----------------------- End of diff ----------------------- |