th-libs: th_util.c annotate

annotate th_util.c @ 143:c878cdcfea9d

Implement terminal width.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 07 Dec 2014 20:49:10 +0200
parents	aa2d608fb3f3
children	fdea1c3acc53

rev	line source
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Generic utility-functions, macros and defaults
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
66 34d58b0f2d52 Update copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	4 * (C) Copyright 2002-2012 Tecnic Software productions (TNSP)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "th_util.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include <stdio.h>
96 3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	10 #include <errno.h>
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	11
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12
4 67f4a4233372 Move defaults to header file. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	13 /* Default settings
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 */
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	15 static BOOL th_initialized = FALSE;
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	16 int th_verbosityLevel = 2;
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	17 char *th_prog_name = NULL,
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	18 *th_prog_desc = NULL,
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	19 *th_prog_version = NULL,
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	20 *th_prog_author = NULL,
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	21 *th_prog_license = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 /* Initialize th_util-library and global variables
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 */
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	26 void th_init(char name, char desc, char *version,
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	27 char author, char license)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 {
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	29 th_prog_name = name;
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	30 th_prog_desc = desc;
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	31 th_prog_version = version;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	33 if (author)
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	34 th_prog_author = author;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	35 else
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	36 th_prog_author = TH_PROG_AUTHOR;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	38 if (license)
eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	39 th_prog_license = license;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	40 else
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	41 th_prog_license = TH_PROG_LICENSE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	43 th_initialized = TRUE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46
64 40b6e8dca885 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	47 void th_print_banner(FILE outFile, const char name, const char *usage)
45 e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	48 {
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	49 fprintf(outFile,
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	50 "\n%s v%s (%s)\n"
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	51 "%s\n"
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	52 "%s\n"
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	53 "Usage: %s %s\n",
60 eef9c6312b88 Change some internals. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	54 th_prog_name, th_prog_version, th_prog_desc,
64 40b6e8dca885 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	55 th_prog_author, th_prog_license, name, usage);
45 e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	56 }
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	57
e031a062b731 Separate program "banner" printing from th_args_help() to th_print_banner(). Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	58
143 c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	59 int th_term_width()
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	60 {
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	61 char *var = getenv("COLUMNS");
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	62 int res = (var != NULL) ? atoi(var) : 80;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	63 if (res < 5) res = 80;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	64 return res;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	65 }
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	66
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	67
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	68 int th_term_height()
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	69 {
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	70 char *var = getenv("LINESS");
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	71 int res = (var != NULL) ? atoi(var) : 25;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	72 if (res < 1) res = 1;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	73 return res;
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	74 }
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	75
c878cdcfea9d Implement terminal width. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	76
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 /* Print formatted error, warning and information messages
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 * TODO: Implement th_vfprintf() and friends?
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 */
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	80 void THERR_V(const char *fmt, va_list ap)
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	81 {
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	82 assert(th_initialized == TRUE);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	83
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	84 fprintf(stderr, "%s: ", th_prog_name);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	85 vfprintf(stderr, fmt, ap);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	86 }
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	87
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	88
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	89 void THMSG_V(int level, const char *fmt, va_list ap)
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	90 {
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	91 assert(th_initialized == TRUE);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	92
48 55e36ec05881 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	93 if (th_verbosityLevel >= level)
55e36ec05881 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	94 {
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	95 fprintf(stderr, "%s: ", th_prog_name);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	96 vfprintf(stderr, fmt, ap);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	97 }
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	98 }
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	99
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	100
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	101 void THPRINT_V(int level, const char *fmt, va_list ap)
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	102 {
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	103 assert(th_initialized == TRUE);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	104
48 55e36ec05881 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	105 if (th_verbosityLevel >= level)
55e36ec05881 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	106 {
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	107 vfprintf(stderr, fmt, ap);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	108 }
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	109 }
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	110
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	111
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	112 void THERR(const char *fmt, ...)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	114 va_list ap;
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	115 assert(th_initialized == TRUE);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	117 va_start(ap, fmt);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	118 THERR_V(fmt, ap);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	119 va_end(ap);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	123 void THMSG(int level, const char *fmt, ...)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	125 va_list ap;
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	126 assert(th_initialized == TRUE);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	128 va_start(ap, fmt);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	129 THMSG_V(level, fmt, ap);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	130 va_end(ap);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	134 void THPRINT(int level, const char *fmt, ...)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	136 va_list ap;
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	137 assert(th_initialized == TRUE);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138
11 e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	139 va_start(ap, fmt);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	140 THPRINT_V(level, fmt, ap);
e467b3586e4d Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	141 va_end(ap);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144
96 3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	145 /* Error handling
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	146 */
101 a8f732601fdc Rename th_get_errno() to th_get_error(), it's more appropriate since it does Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	147 int th_get_error()
96 3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	148 {
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	149 return TH_SYSTEM_ERRORS + errno;
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	150 }
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	151
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	152
99 5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	153 int th_errno_to_error(int error)
5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	154 {
5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	155 return TH_SYSTEM_ERRORS + error;
5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	156 }
5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	157
5819454a28a4 Add th_errno_to_error(). Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	158
96 3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	159 const char *th_error_str(int error)
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	160 {
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	161 if (error >= TH_SYSTEM_ERRORS)
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	162 return strerror(error - TH_SYSTEM_ERRORS);
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	163
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	164 switch (error)
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	165 {
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	166 case THERR_OK: return "No error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	167 case THERR_FOPEN: return "File open error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	168 case THERR_FREAD: return "Read error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	169 case THERR_FWRITE: return "Write error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	170 case THERR_FSEEK: return "Seek error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	171 case THERR_NOT_FOUND: return "Resource not found";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	172
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	173 case THERR_INVALID_DATA: return "Invalid data";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	174 case THERR_MALLOC: return "Memory allocation failure";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	175 case THERR_ALREADY_INIT: return "Already initialized";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	176 case THERR_INIT_FAIL: return "Initialization failed";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	177 case THERR_INVALID_ARGS: return "Invalid arguments";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	178
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	179 case THERR_NULLPTR: return "NULL pointer";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	180 case THERR_NOT_SUPPORTED: return "Operation not supported";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	181 case THERR_OUT_OF_DATA: return "Out of data";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	182 case THERR_EXTRA_DATA: return "Extra data";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	183 case THERR_BOUNDS: return "Bounds check failed";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	184
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	185 case THERR_TIMED_OUT: return "Operation timed out";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	186
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	187 case THERR_AUTH_FAILED: return "Authentication failed";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	188
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	189 default: return "Unknown error";
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	190 }
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	191 }
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	192
3df6bec3c6b1 Add error handling stuff. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	193
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194 /* Memory handling routines
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 void *th_malloc(size_t l)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	198 return malloc(l);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201
68 29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	202 void *th_malloc0(size_t l)
29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	203 {
29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	204 return calloc(1, l);
29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	205 }
29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	206
29f9651465c6 Added a new memory allocator function, th_malloc0(size), which is the same as calloc(1, size). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	207
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 void *th_calloc(size_t n, size_t l)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	210 return calloc(n, l);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 void th_realloc(void p, size_t l)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	216 return realloc(p, l);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 void th_free(void *p)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	222 /* Check for NULL pointers for portability due to some libc
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	223 * implementations not handling free(NULL) too well.
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	224 */
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	225 if (p) free(p);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	229 /* Doubly linked list handling
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	230 *
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	231 * In this implementation first node's prev points to last node of the list,
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	232 * and last node's next is NULL. This way we can semi-efficiently traverse to
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	233 * beginning and end of the list, assuming user does not do weird things.
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	234 */
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	235 qlist_t * th_llist_new(void *data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	236 {
125 0ac59c798773 Use th_malloc0() where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	237 qlist_t *res = th_malloc0(sizeof(qlist_t));
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	238 res->data = data;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	239 return res;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	240 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	241
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	242 void th_llist_free_func(qlist_t list, void (freefunc)(void *data))
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	243 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	244 qlist_t *curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	245
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	246 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	247 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	248 qlist_t *next = curr->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	249 if (freefunc != NULL && curr->data != NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	250 freefunc(curr->data);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	251 th_free(curr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	252 curr = next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	253 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	254 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	255
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	256
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	257 void th_llist_free(qlist_t *list)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	258 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	259 th_llist_free_func(list, NULL);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	260 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	261
53 2c90b33d3617 Add th_llist_append_node() and th_llist_prepend_node() to public header. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	262
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	263 void th_llist_append_node(qlist_t *list, qlist_t node)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	264 {
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	265 if (*list != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	266 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	267 node->prev = (*list)->prev;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	268 (*list)->prev->next = node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	269 (*list)->prev = node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	270 (*list)->num++;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	271 }
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	272 else
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	273 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	274 *list = node;
59 82cfbebaa8b9 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	275 node->prev = node;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	276 (*list)->num = 1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	277 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	278
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	279 node->next = NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	280 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	281
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	282
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	283 qlist_t th_llist_append(qlist_t list, void data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	284 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	285 qlist_t *node = th_llist_new(data);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	286
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	287 th_llist_append_node(list, node);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	288
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	289 return node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	290 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	291
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	292
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	293 void th_llist_prepend_node(qlist_t *list, qlist_t node)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	294 {
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	295 if (*list != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	296 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	297 node->prev = (*list)->prev;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	298 node->next = *list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	299 (*list)->prev = node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	300 node->num = (*list)->num + 1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	301 *list = node;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	302 }
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	303 else
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	304 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	305 *list = node->prev = node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	306 node->next = NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	307 (*list)->num = 1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	308 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	309
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	310 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	311
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	312
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	313 qlist_t th_llist_prepend(qlist_t list, void data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	314 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	315 qlist_t *node = th_llist_new(data);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	316
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	317 th_llist_prepend_node(list, node);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	318
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	319 return node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	320 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	321
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	322 /*
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	323 1) Remove a middle node
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	324
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	325 node0->prev->next = node->next (node1)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	326 node0->next->prev = node->prev (list)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	327
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	328 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	329 node2 <- list <=> node1 <=> node2 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	330
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	331 2) Remove first node when many items
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	332
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	333
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	334 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	335 node2 <- node0 <=> node1 <=> node2 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	336
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	337 *list = node0
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	338
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	339 3) Remove last node in list
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	340
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	341 if (node->next == NULL) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	342 list->prev = node->prev;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	343 node->prev->next = NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	344 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	345
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	346 node2 <- list <=> node0 <=> node1 <=> node2 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	347 node1 <- list <=> node0 <=> node1 -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	348
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	349 4) Remove last
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	350
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	351 list <- list -> NULL
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	352
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	353
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	354 */
93 029b3dea31ff Make th_llist_delete_node_fast() public. Matti Hamalainen <ccr@tnsp.org> parents: 68 diff changeset	355 void th_llist_delete_node_fast(qlist_t *list, qlist_t node)
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	356 {
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	357 if (node == *list)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	358 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	359 // First node in list
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	360 qlist_t tmp = (list)->next;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	361 if (tmp != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	362 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	363 tmp->num = (*list)->num - 1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	364 tmp->prev = (*list)->prev;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	365 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	366 *list = tmp;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	367 }
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	368 else
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	369 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	370 // Somewhere in middle or end
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	371 if (node->prev != NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	372 node->prev->next = node->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	373
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	374 if (node->next != NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	375 node->next->prev = node->prev;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	376 else
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	377 (*list)->prev = node; // Last node
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	378
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	379 (*list)->num--;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	380 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	381
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	382 node->next = node->prev = NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	383 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	384
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	385
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	386 void th_llist_delete_node(qlist_t *list, qlist_t node)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	387 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	388 qlist_t curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	389
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	390 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	391 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	392 qlist_t *next = curr->next;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	393 if (curr == node)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	394 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	395 th_llist_delete_node_fast(list, curr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	396 th_free(node);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	397 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	398 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	399 curr = next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	400 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	401 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	402
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	403
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	404 void th_llist_delete(qlist_t *list, const void data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	405 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	406 qlist_t curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	407
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	408 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	409 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	410 qlist_t *next = curr->next;
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	411 if (curr->data == data)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	412 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	413 th_llist_delete_node_fast(list, curr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	414 th_free(curr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	415 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	416 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	417 curr = next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	418 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	419 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	420
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	421
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	422 qlist_t * th_llist_get_nth(qlist_t *list, const size_t n)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	423 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	424 qlist_t *curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	425 size_t i;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	426
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	427 for (i = 0; curr != NULL && i < n; curr = curr->next, i++);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	428
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	429 return curr;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	430 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	431
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	432
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	433 size_t th_llist_length(const qlist_t *list)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	434 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	435 if (list == NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	436 return 0;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	437 else
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	438 return list->num;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	439 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	440
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	441
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	442 ssize_t th_llist_position(const qlist_t list, const qlist_t node)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	443 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	444 const qlist_t *curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	445 ssize_t i = 0;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	446
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	447 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	448 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	449 if (curr == node)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	450 return i;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	451 else
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	452 i++;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	453
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	454 curr = curr->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	455 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	456
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	457 return -1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	458 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	459
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	460
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	461 void th_llist_foreach(qlist_t list, void (func)(qlist_t node, void userdata), void *data)
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	462 {
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	463 qlist_t *curr = list;
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	464
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	465 while (curr != NULL)
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	466 {
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	467 func(curr, data);
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	468 curr = curr->next;
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	469 }
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	470 }
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	471
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	472
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	473 int th_llist_foreach_cond(qlist_t list, int (func)(qlist_t node, void userdata), void data, qlist_t *ret)
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	474 {
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	475 qlist_t *curr = list;
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	476
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	477 while (curr != NULL)
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	478 {
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	479 int res = func(curr, data);
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	480 if (res != 0)
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	481 {
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	482 *ret = curr;
300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	483 return res;
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	484 }
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	485 curr = curr->next;
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	486 }
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	487
55 300fba04b7ad Adjust the foreach linked list functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	488 return 0;
54 48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	489 }
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	490
48926b3ff598 Add new linked list handling functions: th_llist_foreach() and th_llist_foreach_cond() Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	491
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	492 qlist_t * th_llist_find(qlist_t list, const void data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	493 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	494 qlist_t *curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	495
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	496 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	497 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	498 if (curr->data == data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	499 return curr;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	500 curr = curr->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	501 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	502
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	503 return NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	504 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	505
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	506
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	507 qlist_t * th_llist_find_func(qlist_t list, const void userdata, int (compare)(const void , const void ))
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	508 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	509 qlist_t *curr = list;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	510
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	511 while (curr != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	512 {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	513 if (compare(curr->data, userdata) == 0)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	514 return curr;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	515 curr = curr->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	516 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	517
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	518 return NULL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	519 }
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	520
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	521
26 04187ae0b3b6 Comment. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	522 /*
04187ae0b3b6 Comment. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	523 * Ringbuffers
04187ae0b3b6 Comment. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	524 */
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	525 qringbuf_t * th_ringbuf_new(const size_t size, void (mdeallocator)(void data))
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	526 {
125 0ac59c798773 Use th_malloc0() where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	527 qringbuf_t *res = th_malloc0(sizeof(qringbuf_t));
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	528
33 06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	529 res->data = (char *) th_calloc(size, sizeof(char ));
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	530 res->size = size;
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	531 res->n = 0;
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	532 res->deallocator = mdeallocator;
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	533
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	534 return res;
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	535 }
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	536
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	537
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	538 BOOL th_ringbuf_grow(qringbuf_t *buf, const size_t n)
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	539 {
33 06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	540 buf->data = (char *) th_realloc(buf->data, (buf->size + n) sizeof(char *));
40 5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	541 if (buf->data != NULL)
5b1e38a41bac Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	542 {
98 1760e7f53359 Remove th_memset(). Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	543 memset(buf->data + buf->size, 0, sizeof(char ) n);
33 06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	544 buf->size += n;
06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	545 return TRUE;
06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	546 } else
06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	547 return FALSE;
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	548 }
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	549
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	550
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	551 void th_ringbuf_free(qringbuf_t *buf)
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	552 {
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	553 int i;
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	554
33 06a72c643460 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	555 for (i = 0; i < buf->size; i++)
58 c12b66ec0362 Add braces, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	556 {
25 2f7270a9d593 Make ringbuffer deallocator function call only happen if data pointer is != NULL Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	557 if (buf->data[i] != NULL)
2f7270a9d593 Make ringbuffer deallocator function call only happen if data pointer is != NULL Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	558 buf->deallocator(buf->data[i]);
58 c12b66ec0362 Add braces, mostly cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	559 }
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	560
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	561 th_free(buf->data);
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	562 th_free(buf);
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	563 }
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	564
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	565
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	566 void th_ringbuf_add(qringbuf_t buf, void ptr)
a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	567 {
28 c47dcb8a4ffe Change how ringbuffer actually works to be more sensible. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	568 if (buf->n < buf->size)
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	569 buf->n++;
28 c47dcb8a4ffe Change how ringbuffer actually works to be more sensible. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	570
c47dcb8a4ffe Change how ringbuffer actually works to be more sensible. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	571 th_free(buf->data[0]);
c47dcb8a4ffe Change how ringbuffer actually works to be more sensible. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	572 memmove(&(buf->data[0]), &(buf->data[1]), (buf->size - 1) * sizeof(void *));
c47dcb8a4ffe Change how ringbuffer actually works to be more sensible. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	573 buf->data[buf->size - 1] = ptr;
23 a4f894105953 Add ringbuffer implementation. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	574 }
109 fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	575
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	576
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	577 /*
115 13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	578 * Simple legacy string growing buffer
109 fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	579 */
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	580 BOOL th_strbuf_grow(char *buf, size_t bufsize, size_t *len, size_t grow)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	581 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	582 if (*buf == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	583 bufsize = len = 0;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	584
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	585 if (buf == NULL \|\| len + grow >= *bufsize)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	586 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	587 *bufsize += grow + TH_BUFGROW;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	588 buf = th_realloc(buf, *bufsize);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	589 if (*buf == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	590 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	591 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	592 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	593 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	594
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	595
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	596 BOOL th_strbuf_putch(char *buf, size_t bufsize, size_t *len, const char ch)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	597 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	598 if (!th_strbuf_grow(buf, bufsize, len, 1))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	599 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	600
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	601 (buf)[len] = ch;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	602 (*len)++;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	603
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	604 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	605 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	606
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	607
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	608 BOOL th_strbuf_puts(char *buf, size_t bufsize, size_t len, const char str)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	609 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	610 size_t slen;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	611 if (str == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	612 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	613
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	614 slen = strlen(str);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	615 if (!th_strbuf_grow(buf, bufsize, len, slen + 1))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	616 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	617
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	618 memcpy(buf + len, str, slen + 1);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	619 (*len) += slen;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	620
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	621 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	622 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	623
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	624
115 13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	625 /*
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	626 * Growing buffer
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	627 */
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	628 void th_growbuf_clear(th_growbuf_t *buf)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	629 {
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	630 // Simply reset the current "length"
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	631 buf->len = 0;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	632 }
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	633
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	634
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	635 void th_growbuf_init(th_growbuf_t *buf, const size_t mingrow)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	636 {
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	637 // Initialize the buffer structure
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	638 memset(buf, 0, sizeof(th_growbuf_t));
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	639 buf->mingrow = mingrow;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	640 }
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	641
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	642
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	643 th_growbuf_t *th_growbuf_new(const size_t mingrow)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	644 {
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	645 th_growbuf_t *buf;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	646
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	647 if ((buf = th_malloc(sizeof(th_growbuf_t))) == NULL)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	648 return NULL;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	649
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	650 th_growbuf_init(buf, mingrow);
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	651 buf->allocated = TRUE;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	652
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	653 return buf;
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	654 }
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	655
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	656
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	657 void th_growbuf_free(th_growbuf_t *buf)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	658 {
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	659 th_free(buf->data);
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	660
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	661 if (buf->allocated)
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	662 th_free(buf);
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	663 }
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	664
13f001f1ad6e More work on growbuf stuff. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	665
109 fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	666 BOOL th_growbuf_grow(th_growbuf_t *buf, const size_t grow)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	667 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	668 if (buf == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	669 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	670
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	671 if (buf->data == NULL \|\| buf->len + grow >= buf->size)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	672 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	673 buf->size += grow + (buf->mingrow > 0 ? buf->mingrow : TH_BUFGROW);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	674 buf->data = (uint8_t *) th_realloc(buf->data, buf->size);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	675 if (buf->data == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	676 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	677 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	678 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	679 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	680
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	681
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	682 BOOL th_growbuf_puts(th_growbuf_t buf, const char str, BOOL eos)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	683 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	684 size_t slen;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	685 if (str == NULL)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	686 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	687
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	688 slen = strlen(str);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	689 if (!th_growbuf_grow(buf, slen + 1))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	690 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	691
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	692 memcpy(buf->data + buf->len, str, slen + 1);
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	693 buf->len += eos ? (slen + 1) : slen;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	694
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	695 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	696 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	697
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	698
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	699 BOOL th_growbuf_putch(th_growbuf_t *buf, const char ch)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	700 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	701 if (!th_growbuf_grow(buf, sizeof(char)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	702 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	703
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	704 buf->data[buf->len++] = (uint8_t) ch;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	705
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	706 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	707 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	708
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	709
120 41c2638ee537 Use void* instead of uint8_t* in th_growbuf_put_str() Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	710 BOOL th_growbuf_put_str(th_growbuf_t buf, const void s, const size_t len)
111 cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	711 {
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	712 if (s == NULL)
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	713 return FALSE;
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	714
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	715 if (!th_growbuf_grow(buf, len + 1))
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	716 return FALSE;
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	717
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	718 memcpy(buf->data + buf->len, s, len + 1);
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	719 buf->len += len;
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	720
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	721 return TRUE;
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	722 }
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	723
cddfc43a4e45 More functions for growbuf. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	724
109 fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	725 BOOL th_growbuf_put_u8(th_growbuf_t *buf, const uint8_t val)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	726 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	727 if (!th_growbuf_grow(buf, sizeof(uint8_t)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	728 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	729
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	730 buf->data[buf->len++] = val;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	731
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	732 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	733 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	734
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	735
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	736 BOOL th_growbuf_put_u16_be(th_growbuf_t *buf, const uint16_t val)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	737 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	738 if (!th_growbuf_grow(buf, sizeof(uint16_t)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	739 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	740
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	741 buf->data[buf->len++] = (val >> 8) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	742 buf->data[buf->len++] = val & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	743
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	744 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	745 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	746
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	747
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	748 BOOL th_growbuf_put_u16_le(th_growbuf_t *buf, const uint16_t val)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	749 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	750 if (!th_growbuf_grow(buf, sizeof(uint16_t)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	751 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	752
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	753 buf->data[buf->len++] = val & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	754 buf->data[buf->len++] = (val >> 8) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	755
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	756 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	757 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	758
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	759
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	760 BOOL th_growbuf_put_u32_be(th_growbuf_t *buf, const uint32_t val)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	761 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	762 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	763 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	764
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	765 buf->data[buf->len++] = (val >> 24) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	766 buf->data[buf->len++] = (val >> 16) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	767 buf->data[buf->len++] = (val >> 8) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	768 buf->data[buf->len++] = val & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	769
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	770 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	771 }
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	772
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	773
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	774 BOOL th_growbuf_put_u32_le(th_growbuf_t *buf, const uint32_t val)
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	775 {
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	776 if (!th_growbuf_grow(buf, sizeof(uint32_t)))
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	777 return FALSE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	778
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	779 buf->data[buf->len++] = val & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	780 buf->data[buf->len++] = (val >> 8) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	781 buf->data[buf->len++] = (val >> 16) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	782 buf->data[buf->len++] = (val >> 24) & 0xff;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	783
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	784 return TRUE;
fedad0ed894f Remove th_growbuf, move to th_util. Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	785 }

Mercurial > hg > th-libs

annotate th_util.c @ 143:c878cdcfea9d