Mercurial > hg > nnchat

comparison main.c @ 443:96cb82ebb93b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename a structure member.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 25 May 2012 22:01:55 +0300
parents ecbd9773c74b
children 29a341fa80a1
comparison
equal deleted inserted replaced
442:ecbd9773c74b 443:96cb82ebb93b
840 } 840 }
841 841
842 842
843 typedef struct 843 typedef struct
844 { 844 {
845 char *cmd; 845 char *name;
846 size_t len; 846 size_t len;
847 int (*handler)(nn_conn_t *); 847 int (*handler)(nn_conn_t *);
848 } nn_protocolcmd_t; 848 } nn_protocolcmd_t;
849 849
850 850
867 int i; 867 int i;
868 868
869 if (!protoCmdsInit) 869 if (!protoCmdsInit)
870 { 870 {
871 for (i = 0; i < nprotoCmds; i++) 871 for (i = 0; i < nprotoCmds; i++)
872 protoCmds[i].len = strlen(protoCmds[i].cmd); 872 protoCmds[i].len = strlen(protoCmds[i].name);
873 873
874 protoCmdsInit = TRUE; 874 protoCmdsInit = TRUE;
875 } 875 }
876 876
877 for (i = 0; i < nprotoCmds; i++) 877 for (i = 0; i < nprotoCmds; i++)
878 { 878 {
879 if (!nn_conn_buf_strncmp(conn, protoCmds[i].cmd, protoCmds[i].len)) 879 if (!nn_conn_buf_strncmp(conn, protoCmds[i].name, protoCmds[i].len))
880 return protoCmds[i].handler(conn); 880 return protoCmds[i].handler(conn);
881 } 881 }
882 882
883 if (optDebug) 883 if (optDebug)
884 { 884 {
1147 CMDARG_NICK, 1147 CMDARG_NICK,
1148 }; 1148 };
1149 1149
1150 typedef struct 1150 typedef struct
1151 { 1151 {
1152 char *cmd; 1152 char *name;
1153 int flags; 1153 int flags;
1154 size_t len; 1154 size_t len;
1155 int (*handler)(nn_conn_t *, char *buf); 1155 int (*handler)(nn_conn_t *, char *buf);
1156 } nn_usercmd_t; 1156 } nn_usercmd_t;
1157 1157
1189 1189
1190 // Initialize command structure 1190 // Initialize command structure
1191 if (!userCmdsInit) 1191 if (!userCmdsInit)
1192 { 1192 {
1193 for (i = 0; i < nuserCmds; i++) 1193 for (i = 0; i < nuserCmds; i++)
1194 userCmds[i].len = strlen(userCmds[i].cmd); 1194 userCmds[i].len = strlen(userCmds[i].name);
1195 1195
1196 userCmdsInit = TRUE; 1196 userCmdsInit = TRUE;
1197 } 1197 }
1198 1198
1199 1199
1200 for (i = 0; i < nuserCmds; i++) 1200 for (i = 0; i < nuserCmds; i++)
1201 { 1201 {
1202 nn_usercmd_t *cmd = &userCmds[i]; 1202 nn_usercmd_t *cmd = &userCmds[i];
1203 if (!th_strncasecmp(buf + 1, cmd->cmd, cmd->len)) 1203 if (!th_strncasecmp(buf + 1, cmd->name, cmd->len))
1204 { 1204 {
1205 char *nbuf = str_trim_left(buf + 1 + cmd->len); 1205 char *nbuf = str_trim_left(buf + 1 + cmd->len);
1206 1206
1207 switch (cmd->flags) 1207 switch (cmd->flags)
1208 { 1208 {
1209 case CMDARG_NICK: 1209 case CMDARG_NICK:
1210 case CMDARG_STRING: 1210 case CMDARG_STRING:
1211 if (!nbuf[0]) 1211 if (!nbuf[0])
1212 { 1212 {
1213 printMsgQ(currWin, "Command: /%s requires an argument.\n", cmd->cmd); 1213 printMsgQ(currWin, "Command: /%s requires an argument.\n", cmd->name);
1214 return 1; 1214 return 1;
1215 } 1215 }
1216 break; 1216 break;
1217 1217
1218 case CMDARG_NONE: 1218 case CMDARG_NONE:
1219 if (nbuf[0]) 1219 if (nbuf[0])
1220 { 1220 {
1221 printMsgQ(currWin, "Command: /%s does not take arguments.\n", cmd->cmd); 1221 printMsgQ(currWin, "Command: /%s does not take arguments.\n", cmd->name);
1222 return 1; 1222 return 1;
1223 } 1223 }
1224 break; 1224 break;
1225 1225
1226 case CMDARG_OPTIONAL: 1226 case CMDARG_OPTIONAL: