projects
/
runtime.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed silc_nickname_parse to return valid nickname when it returns
[runtime.git]
/
lib
/
silcclient
/
client_entry.c
diff --git
a/lib/silcclient/client_entry.c
b/lib/silcclient/client_entry.c
index 9510b40441ae4b9be375982ad6895f0c65fe361e..32f272ec189b8fdff80cd6593cd9e72c3675b58c 100644
(file)
--- a/
lib/silcclient/client_entry.c
+++ b/
lib/silcclient/client_entry.c
@@
-85,13
+85,8
@@
SilcDList silc_client_get_clients_local_ext(SilcClient client,
if (!silc_client_nickname_parse(client, conn, (char *)nick, &parsed))
return NULL;
if (!silc_client_nickname_parse(client, conn, (char *)nick, &parsed))
return NULL;
- if (!get_all
&& parsed
)
+ if (!get_all)
format = (char *)nick;
format = (char *)nick;
- if (!parsed) {
- parsed = silc_memdup(nick, strlen(nick));
- if (!parsed)
- return NULL;
- }
SILC_LOG_DEBUG(("Find clients by nickname %s", parsed));
SILC_LOG_DEBUG(("Find clients by nickname %s", parsed));
@@
-124,7
+119,7
@@
SilcDList silc_client_get_clients_local_ext(SilcClient client,
}
silc_list_start(list);
}
silc_list_start(list);
- if (
!format &&
get_all) {
+ if (get_all) {
/* Take all without any further checking */
while ((id_cache = silc_list_get(list))) {
entry = id_cache->context;
/* Take all without any further checking */
while ((id_cache = silc_list_get(list))) {
entry = id_cache->context;
@@
-1298,7
+1293,7
@@
SilcBool silc_client_nickname_parse(SilcClient client,
int len;
if (!client->internal->params->nickname_format[0]) {
int len;
if (!client->internal->params->nickname_format[0]) {
- *ret_nick =
NULL
;
+ *ret_nick =
silc_strdup(nickname)
;
return TRUE;
}
return TRUE;
}