diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-02-13 14:09:21 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-02-13 14:09:21 +0000 |
| commit | c2d8dc7eeee8e7fccef6b436ef5927d0d1cbb4a3 (patch) | |
| tree | 5cde0b20c728eb16a536cc9f4f5244e23d55334a | |
| parent | 0da21a5f59dc1a0d7fad538789dcbbf74134c1a3 (diff) | |
| download | irssi-c2d8dc7eeee8e7fccef6b436ef5927d0d1cbb4a3.zip | |
PARAM_FLAG_OPTCHAN_NAME check didn't work properly and it was always
assumed, so * didn't work as channel parameter. also changed the how
PARAM_FLAG_OPTCHAN_NAME was defined.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2435 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/commands.c | 3 | ||||
| -rw-r--r-- | src/core/commands.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/commands.c b/src/core/commands.c index a96b5fa0..0899c9fa 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -717,7 +717,8 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...) cnt = PARAM_WITHOUT_FLAGS(count); if (count & PARAM_FLAG_OPTCHAN) { /* optional channel as first parameter */ - require_name = (count & PARAM_FLAG_OPTCHAN_NAME); + require_name = (count & PARAM_FLAG_OPTCHAN_NAME) == + PARAM_FLAG_OPTCHAN_NAME; arg = get_optional_channel(item, &datad, require_name); str = (char **) va_arg(args, char **); diff --git a/src/core/commands.h b/src/core/commands.h index 3e55a2ad..e3bf4374 100644 --- a/src/core/commands.h +++ b/src/core/commands.h @@ -136,7 +136,7 @@ int command_have_option(const char *cmd, const char *option); /* optional channel in first argument */ #define PARAM_FLAG_OPTCHAN 0x00010000 /* optional channel in first argument, but don't treat "*" as current channel */ -#define PARAM_FLAG_OPTCHAN_NAME 0x00030000 +#define PARAM_FLAG_OPTCHAN_NAME (0x00020000|PARAM_FLAG_OPTCHAN) char *cmd_get_param(char **data); /* get parameters from command - you should point free_me somewhere and |