projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch
[silc.git]
/
apps
/
silcd
/
server_util.c
diff --git
a/apps/silcd/server_util.c
b/apps/silcd/server_util.c
index 28e33ed15d73d0d93d567853d4378ab8f2cbf1a4..9bcc47b20377b5c8c5acd8a0152dce1ca08d1656 100644
(file)
--- a/
apps/silcd/server_util.c
+++ b/
apps/silcd/server_util.c
@@
-20,7
+20,6
@@
#include "serverincludes.h"
#include "server_internal.h"
#include "serverincludes.h"
#include "server_internal.h"
-#include <assert.h>
extern char *server_version;
extern char *server_version;
@@
-120,7
+119,7
@@
silc_server_remove_clients_channels(SilcServer server,
silc_hash_table_add(channels, channel, channel);
}
silc_hash_table_list_reset(&htl);
silc_hash_table_add(channels, channel, channel);
}
silc_hash_table_list_reset(&htl);
-
assert
(!silc_hash_table_count(client->channels));
+
SILC_VERIFY
(!silc_hash_table_count(client->channels));
}
/* This function removes all client entries that are originated from
}
/* This function removes all client entries that are originated from
@@
-206,7
+205,7
@@
SilcBool silc_server_remove_clients_by_server(SilcServer server,
}
/* Update statistics */
}
/* Update statistics */
-
assert
(server->stat.clients > 0);
+
SILC_VERIFY
(server->stat.clients > 0);
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;
@@
-270,7
+269,7
@@
SilcBool silc_server_remove_clients_by_server(SilcServer server,
}
/* Update statistics */
}
/* Update statistics */
-
assert
(server->stat.clients > 0);
+
SILC_VERIFY
(server->stat.clients > 0);
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;
@@
-1563,7
+1562,7
@@
void silc_server_kill_client(SilcServer server,
}
} else {
/* Update statistics */
}
} else {
/* Update statistics */
-
assert
(server->stat.clients > 0);
+
SILC_VERIFY
(server->stat.clients > 0);
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;
server->stat.clients--;
if (server->stat.cell_clients)
server->stat.cell_clients--;