nnchat: util.c annotate

annotate util.c @ 485:ad7ddce47878

Improve nn_userhash_foreach() by adding user data parameter.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 26 May 2012 15:30:46 +0300
parents	607bd4491e79
children	73f8df0ecffe

rev	line source
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * NNChat - Custom chat client for NewbieNudes.com chatrooms
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Written by Matti 'ccr' Hämäläinen
394 cabf2233ea39 Update copyright. Matti Hamalainen <ccr@tnsp.org> parents: 393 diff changeset	4 * (C) Copyright 2008-2012 Tecnic Software productions (TNSP)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
413 14b685cdbd2c Rename files. Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	6 #include "util.h"
468 607bd4491e79 Fix win32 build. Matti Hamalainen <ccr@tnsp.org> parents: 466 diff changeset	7 #include <time.h>
396 07a46ca075ab Add some new functions for socket / connection input buffer Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	8
07a46ca075ab Add some new functions for socket / connection input buffer Matti Hamalainen <ccr@tnsp.org> parents: 395 diff changeset	9
464 35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	10 BOOL str_get_timestamp(char str, size_t len, const char fmt)
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	11 {
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	12 time_t stamp = time(NULL);
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	13 struct tm *stamp_tm;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	14 if ((stamp_tm = localtime(&stamp)) != NULL)
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	15 {
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	16 strftime(str, len, fmt, stamp_tm);
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	17 return TRUE;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	18 }
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	19 else
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	20 {
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	21 str[0] = 0;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	22 return FALSE;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	23 }
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	24 }
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	25
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	26
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	27 char * str_trim_left(char *buf)
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	28 {
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	29 while (buf != 0 && th_isspace(buf)) buf++;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	30 return buf;
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	31 }
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	32
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	33
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	34 int str_compare(const void s1, const void s2)
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	35 {
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	36 return th_strcasecmp((const char ) s1, (const char ) s2);
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	37 }
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	38
35d67bd0613b Move str_() functions to util.c Matti Hamalainen <ccr@tnsp.org>* parents: 453 diff changeset	39
304 61884ce9db41 Use th_vputch() and th_vputs() instead of similar routines in libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 285 diff changeset	40 #define PUSHCHAR(x) th_vputch(&result, &resSize, &resPos, x)
61884ce9db41 Use th_vputch() and th_vputs() instead of similar routines in libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 285 diff changeset	41 #define PUSHSTR(x) th_vputs(&result, &resSize, &resPos, x)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	43 char nn_encode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	45 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	46 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	47 size_t resSize, resPos = 0;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	48
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	49 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	50
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	51 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	52 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	53 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	54
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	55 while (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	56 {
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	57 switch (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	58 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	59 case 32:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	60 PUSHCHAR('+');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	61 break;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	62
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	63 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	64 if (th_isalnum(*s))
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	65 PUSHCHAR(*s);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	66 else
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	67 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	68 char tmpStr[4];
215 659b8229d015 Silence some warnings on OpenBSD. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	69 snprintf(tmpStr, sizeof(tmpStr), "%2X", (unsigned char) *s);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	70 PUSHCHAR('%');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	71 PUSHSTR(tmpStr);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	72 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	73 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	74 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	75 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	76 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	77 PUSHCHAR(0);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	78
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	79 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
395 74d97581dc46 Rename variable and function, internal use only. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	83 static int nn_get_hexdigit(const int c, const int shift)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	85 int i;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	86
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	87 if (c >= 'A' && c <= 'F')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	88 i = c - 'A' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	89 else if (c >= 'a' && c <= 'f')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	90 i = c - 'a' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	91 else if (c >= '0' && c <= '9')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	92 i = c - '0';
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	93 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	94 return -1;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	95
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	96 return i << shift;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	100 char nn_decode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	102 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	103 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	104 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	105 int c;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	106
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	107 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	108
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	109 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	110 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	111 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	112
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	113 while (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	114 {
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	115 switch (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	116 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	117 case '+':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	118 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	119 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	120 break;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	121
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	122 case '½':
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	123 // Escape these ..
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	124 PUSHCHAR('½');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	125 PUSHCHAR('½');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	126 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	127 break;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	128
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	129 case '\r':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	130 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	131 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	132 break;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	133
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	134 case '%':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	135 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	136 if (*s == '%')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	137 PUSHCHAR('%');
395 74d97581dc46 Rename variable and function, internal use only. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	138 else if ((c = nn_get_hexdigit(*s, 4)) >= 0)
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	139 {
395 74d97581dc46 Rename variable and function, internal use only. Matti Hamalainen <ccr@tnsp.org> parents: 394 diff changeset	140 int i = nn_get_hexdigit(*(++s), 0);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	141 if (i >= 0)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	142 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	143 PUSHCHAR((char) (c \| i));
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	144 }
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	145 else
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	146 {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	147 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	148 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	149 }
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	150 }
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	151 else
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	152 {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	153 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	154 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	155 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	156 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	157 break;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	158
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	159 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	160 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	161 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	162 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	163 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	164 PUSHCHAR(0);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	165
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	166 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	170 char nn_strip_tags(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	172 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	173 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	174 size_t resSize, resPos = 0;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	175
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	176 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	177
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	178 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	179 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	180 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	181
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	182 while (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	183 {
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	184 if (*s == '<')
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	185 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	186 while (s && s != '>') s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	187 if (*s == '>') s++;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	188 }
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	189 else
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	190 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	191 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	192 PUSHCHAR(0);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	193
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	194 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	198 typedef struct
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	199 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	200 char c;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	201 char *ent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	202 } html_entity_t;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	203
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	204
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	205 static const html_entity_t HTMLEntities[] =
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	206 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	207 { '<', "<" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	208 { '>', ">" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	209 };
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	210
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	211 static const int numHTMLEntities = sizeof(HTMLEntities) / sizeof(HTMLEntities[0]);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	212
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	213
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	214 char nn_encode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	216 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	217 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	218 size_t resSize, resPos = 0;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	219
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	220 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	221
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	222 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	223 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	224 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	225
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	226 while (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	227 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	228 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	229 BOOL found = FALSE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	230 for (i = 0; i < numHTMLEntities; i++)
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	231 if (HTMLEntities[i].c == *s)
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	232 {
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	233 PUSHSTR(HTMLEntities[i].ent);
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	234 found = TRUE;
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	235 break;
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	236 }
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	237 if (!found) PUSHCHAR(*s);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	238
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	239 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	240 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	241 PUSHCHAR(0);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	242
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	243 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	247 char nn_decode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	249 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	250 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	251 size_t resSize, resPos = 0;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	252
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	253 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	254
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	255 resSize = strlen(str);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	256 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	257 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	258
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	259 while (*s)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	260 {
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	261 if (*s == '&')
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	262 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	263 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	264 BOOL found = FALSE;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	265 for (i = 0; i < numHTMLEntities; i++)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	266 {
95 69f9c46e4a94 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	267 const html_entity_t *ent = &HTMLEntities[i];
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	268 size_t len = strlen(ent->ent);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	269 if (!strncmp(s, ent->ent, len))
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	270 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	271 PUSHCHAR(ent->c);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	272 s += len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	273 found = TRUE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	274 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	275 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	276 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	277 if (!found) PUSHCHAR(*s++);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	278 }
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	279 else
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	280 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	281 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	282 PUSHCHAR(0);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	283
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	284 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	288 char nn_dbldecode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	289 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	290 char res, tmp;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	291
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	292 if ((tmp = nn_decode_str1(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	293 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	294
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	295 res = nn_decode_str2(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	296 th_free(tmp);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	297
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	298 return res;
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	299 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	300
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	301
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	302 char nn_dblencode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	303 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	304 char res, tmp;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	305
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	306 if ((tmp = nn_encode_str2(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	307 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	308
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	309 res = nn_encode_str1(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	310 th_free(tmp);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	311
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	312 return res;
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	313 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	314
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	315
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	316 int nn_editbuf_write(nn_editbuf_t *buf, size_t pos, char ch)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	317 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	318 if (buf->len+1 >= buf->size) return -3;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	319
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	320 if (pos >= buf->len)
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	321 buf->data[buf->len++] = ch;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	322 else
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	323 buf->data[pos] = ch;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	324
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	325 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	326 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	327
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	328
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	329 int nn_editbuf_insert(nn_editbuf_t *buf, size_t pos, char ch)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	330 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	331 if (buf->len+1 >= buf->size) return -3;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	332
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	333 if (pos >= buf->len)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	334 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	335 buf->data[buf->len] = ch;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	336 }
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	337 else
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	338 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	339 memmove(&(buf->data[pos+1]), &(buf->data[pos]), buf->len - pos + 1);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	340 buf->data[pos] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	341 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	342 buf->len++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	343 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	344 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	345
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	346
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	347 int nn_editbuf_delete(nn_editbuf_t *buf, size_t pos)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	348 {
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	349 if (pos < buf->len)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	350 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	351 memmove(&(buf->data[pos]), &(buf->data[pos+1]), buf->len - pos);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	352 buf->len--;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	353 return 0;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	354 }
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	355 else
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	356 return -2;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	357 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	358
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	359
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	360 void nn_editbuf_clear(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	361 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	362 buf->len = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	363 buf->pos = 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	364 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	365
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	366
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	367 nn_editbuf_t * nn_editbuf_new(size_t n)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	368 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	369 nn_editbuf_t *res = th_calloc(1, sizeof(nn_editbuf_t));
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	370
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	371 res->data = (char *) th_malloc(n);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	372 res->size = n;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	373
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	374 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	375 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	376
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	377
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	378 void nn_editbuf_free(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	379 {
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	380 if (buf != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	381 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	382 th_free(buf->data);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	383 th_free(buf);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	384 }
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	385 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	386
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	387
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	388 nn_editbuf_t * nn_editbuf_copy(nn_editbuf_t *src)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	389 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	390 nn_editbuf_t *res;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	391
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	392 assert(src != NULL);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	393
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	394 if (src == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	395
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	396 if ((res = nn_editbuf_new(src->size)) == NULL)
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	397 return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	398
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	399 memcpy(res->data, src->data, src->size);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	400 res->pos = res->len = src->len;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	401
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	402 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	403 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	404
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	405
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	406 char * nn_editbuf_get_string(nn_editbuf_t *buf, size_t start, size_t end)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	407 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	408 char *str;
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	409 size_t siz;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	410
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	411 if (buf == NULL)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	412 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	413
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	414 if (end > buf->len \|\| start >= buf->len)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	415 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	416
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	417 if (start <= end)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	418 siz = end - start + 1;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	419 else
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	420 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	421
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	422 if ((str = th_malloc(siz + 1)) == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	423 return NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	424
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	425 memcpy(str, buf->data + start, siz);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	426 str[siz] = 0;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	427
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	428 return str;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	429 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	430
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	431
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	432 void nn_editbuf_setpos(nn_editbuf_t *buf, size_t pos)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	433 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	434 assert(buf != NULL);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	435
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	436 if (pos >= buf->len)
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	437 buf->pos = buf->len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	438 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	439 buf->pos = pos;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	440 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	441
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	442
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	443 static uint8_t nn_hash_user(const char *name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	444 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	445 /*
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	446 int n = 0;
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	447 const uint8_t c = (uint8_t )name;
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	448 uint8_t hash = 0xff;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	449
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	450 while (*c && n < 4)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	451 {
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	452 hash = (hash << 1) ^ tolower(*c);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	453 c++; n++;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	454 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	455
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	456 return (hash & 0xff);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	457 */
431 a9b20b31cae1 More code cleanups, this time using clang with excessive warnings enabled. Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	458 return (uint8_t) tolower(name[0]);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	459 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	460
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	461
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	462 static void nn_user_insert(nn_user_t *list, nn_user_t node)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	463 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	464 node->next = *list;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	465 *list = node;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	466 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	467
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	468
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	469 static void nn_user_free(nn_user_t *user)
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	470 {
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	471 th_free(user->name);
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	472 th_free(user);
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	473 }
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	474
3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	475
485 ad7ddce47878 Improve nn_userhash_foreach() by adding user data parameter. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	476 nn_user_t nn_userhash_foreach(const nn_userhash_t list, int (func)(const nn_user_t , void userdata), void data)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	477 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	478 int i;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	479
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	480 if (list == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	481
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	482 for (i = 0; i < NN_NUM_BUCKETS; i++)
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	483 if (list->buckets[i] != NULL)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	484 {
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	485 nn_user_t *curr = list->buckets[i];
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	486 while (curr != NULL)
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	487 {
485 ad7ddce47878 Improve nn_userhash_foreach() by adding user data parameter. Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	488 if (func(curr, data) != 0)
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	489 return curr;
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	490 curr = curr->next;
acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	491 }
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	492 }
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	493
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	494 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	495 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	496
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	497
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	498 nn_user_t nn_userhash_find(const nn_userhash_t list, const char *name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	499 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	500 uint8_t hash;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	501
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	502 if (list == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	503
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	504 hash = nn_hash_user(name);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	505 if (list->buckets[hash] != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	506 {
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	507 nn_user_t *curr = list->buckets[hash];
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	508 while (curr != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	509 {
372 b9f0bdad6285 Use th_strcasecmp() and th_strncasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	510 if (th_strcasecmp(curr->name, name) == 0)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	511 return curr;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	512 curr = curr->next;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	513 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	514 }
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	515
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	516 return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	517 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	518
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	519
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	520 static nn_user_t nn_userhash_match_do(nn_user_t list, const char *pattern, size_t len)
164 701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	521 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	522 nn_user_t *node;
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	523 for (node = list; node != NULL; node = node->next)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	524 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	525 if (len <= strlen(node->name) && th_strncasecmp(node->name, pattern, len) == 0)
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	526 return node;
164 701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	527 }
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	528 return NULL;
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	529 }
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	530
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	531
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	532 nn_user_t nn_userhash_match(const nn_userhash_t list, const char pattern, const char current, BOOL again)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	533 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	534 uint8_t hash;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	535
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	536 if (list == NULL \|\| pattern == NULL) return NULL;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	537
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	538 hash = nn_hash_user(pattern);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	539 if (list->buckets[hash] != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	540 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	541 nn_user_t *node;
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	542 size_t len = strlen(pattern);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	543
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	544 if (current != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	545 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	546 for (node = list->buckets[hash]; node != NULL; node = node->next)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	547 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	548 if (th_strcasecmp(node->name, current) == 0)
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	549 {
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	550 nn_user_t *found;
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	551
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	552 if (again)
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	553 return node;
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	554
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	555 if ((found = nn_userhash_match_do(node->next, pattern, len)) != NULL)
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	556 return found;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	557 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	558 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	559 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	560
452 aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	561 if ((node = nn_userhash_match_do(list->buckets[hash], pattern, len)) != NULL)
aeb3171f9e28 Simplify the userhash matching code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	562 return node;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	563 }
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	564
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	565 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	566 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	567
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	568
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	569 nn_userhash_t *nn_userhash_new(void)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	570 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	571 return th_calloc(1, sizeof(nn_userhash_t));
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	572 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	573
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	574
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	575 int nn_userhash_insert(nn_userhash_t list, const char name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	576 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	577 uint8_t hash;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	578 nn_user_t *user;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	579
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	580 // Check arguments
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	581 if (list == NULL \|\| name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	582 return -1;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	583
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	584 // Check if username is already there
446 3396acd40147 Rename and remove some functions. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	585 if (nn_userhash_find(list, name) != NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	586 return 1;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	587
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	588 // No, we'll add it
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	589 if ((user = th_calloc(1, sizeof(nn_user_t))) == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	590 return -3;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	591
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	592 user->name = th_strdup(name);
c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	593 if (user->name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	594 return -4;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	595
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	596 hash = nn_hash_user(name);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	597 nn_user_insert(&(list->buckets[hash]), user);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	598
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	599 return 0;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	600 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	601
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	602
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	603 int nn_userhash_delete(nn_userhash_t list, const char name)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	604 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	605 uint8_t hash;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	606
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	607 // Check arguments
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	608 if (list == NULL \|\| name == NULL)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	609 return -1;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	610
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	611 // Check if username is already there
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	612 hash = nn_hash_user(name);
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	613 if (list->buckets[hash] != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	614 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	615 nn_user_t curr, prev;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	616 curr = list->buckets[hash];
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	617 prev = NULL;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	618 while (curr != NULL)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	619 {
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	620 if (th_strcasecmp(curr->name, name) == 0)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	621 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	622 if (prev)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	623 prev->next = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	624 else
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	625 list->buckets[hash] = curr->next;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	626
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	627 nn_user_free(curr);
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	628
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	629 return 0;
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	630 }
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	631 else
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	632 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	633 prev = curr;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	634 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	635 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	636 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	637 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	638
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	639 return 1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	640 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	641
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	642
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	643 void nn_userhash_free(nn_userhash_t *hash)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	644 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	645 int i;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	646 if (hash == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	647 return;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	648
386 4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	649 for (i = 0; i < NN_NUM_BUCKETS; i++)
4523fc0941e8 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 374 diff changeset	650 {
453 d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	651 nn_user_t *curr = hash->buckets[i];
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	652
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	653 while (curr != NULL)
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	654 {
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	655 nn_user_t *next = curr->next;
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	656 nn_user_free(curr);
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	657 curr = next;
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	658 }
d55cc0b73c62 Merge nn_user_free_list() into a parent function. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	659
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	660 hash->buckets[i] = NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	661 }
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	662
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	663 th_free(hash);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	664 }
285 b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	665
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	666
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	667 char nn_username_encode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	668 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	669 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	670 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	671 for (; *c ; c++)
285 b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	672 if (c == ' ') c = 255;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	673 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	674 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	675
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	676
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	677 char nn_username_decode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	678 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	679 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	680 if (str == NULL) return NULL;
390 acea18a741e3 Cleanup libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 386 diff changeset	681 for (; *c ; c++)
285 b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	682 if (c == 255) c = ' ';
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	683 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	684 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	685
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	686
330 8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	687 nn_strtuple_t nn_strtuple_new(size_t len, char str)
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	688 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	689 nn_strtuple_t *tuple = th_calloc(1, sizeof(nn_strtuple_t));
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	690 tuple->len = len;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	691 tuple->str = str;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	692 return tuple;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	693 }
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	694
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	695
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	696 void nn_strtuple_free(nn_strtuple_t *tuple)
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	697 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	698 th_free(tuple->str);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	699 th_free(tuple);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	700 }

Mercurial > hg > nnchat

annotate util.c @ 485:ad7ddce47878