nnchat: util.c annotate

annotate util.c @ 464:35d67bd0613b

Move str_*() functions to util.c

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 26 May 2012 06:01:06 +0300
parents	d55cc0b73c62
children	796508f828f6

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

Mercurial > hg > nnchat

annotate util.c @ 464:35d67bd0613b