Thu, 21 Jun 2018 16:10:19 +0200
makes g++ happy again
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
1 | /* |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
3 | * |
259 | 4 | * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved. |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
5 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
8 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
11 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
15 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
27 | */ |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
94
diff
changeset
|
28 | |
251
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
29 | #include "ucx/utils.h" |
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
30 | |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
31 | #include <math.h> |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
32 | #include <stdio.h> |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
33 | #include <limits.h> |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
34 | #include <errno.h> |
89 | 35 | |
94
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
36 | /* COPY FUCNTIONS */ |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
37 | void* ucx_strcpy(const void* s, void* data) { |
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
38 | const char *str = (const char*) s; |
94
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
39 | size_t n = 1+strlen(str); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
40 | char *cpy = (char*) malloc(n); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
41 | memcpy(cpy, str, n); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
42 | return cpy; |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
43 | } |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
44 | |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
45 | void* ucx_memcpy(const void* m, void* n) { |
94
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
46 | size_t k = *((size_t*)n); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
47 | void *cpy = malloc(k); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
48 | memcpy(cpy, m, k); |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
49 | return cpy; |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
50 | } |
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
51 | |
222
e0f850709a5c
changes ucx_stream_Xcopy API
Mike Becker <universe@uap-core.de>
parents:
194
diff
changeset
|
52 | size_t ucx_stream_bncopy(void *src, void *dest, read_func readfnc, |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
53 | write_func writefnc, char* buf, size_t bufsize, size_t n) { |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
54 | if(n == 0 || bufsize == 0) { |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
55 | return 0; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
56 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
57 | |
181
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
58 | char *lbuf; |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
59 | size_t ncp = 0; |
181
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
60 | |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
61 | if(buf) { |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
62 | lbuf = buf; |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
63 | } else { |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
64 | lbuf = (char*)malloc(bufsize); |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
65 | if(lbuf == NULL) { |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
66 | return 0; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
67 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
68 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
69 | |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
70 | size_t r; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
71 | size_t rn = bufsize > n ? n : bufsize; |
181
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
72 | while((r = readfnc(lbuf, 1, rn, src)) != 0) { |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
73 | r = writefnc(lbuf, 1, r, dest); |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
74 | ncp += r; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
75 | n -= r; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
76 | rn = bufsize > n ? n : bufsize; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
77 | if(r == 0 || n == 0) { |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
78 | break; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
79 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
80 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
81 | |
181
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
82 | if (lbuf != buf) { |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
83 | free(lbuf); |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
84 | } |
1e9012ad8215
fixed stream copy bug + fixed doc issues in mempool
Mike Becker <universe@uap-core.de>
parents:
177
diff
changeset
|
85 | |
140
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
86 | return ncp; |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
87 | } |
15f871f50bfd
completed documentation + changed API for buffer/stream generic copy functions
Mike Becker <universe@uap-core.de>
parents:
103
diff
changeset
|
88 | |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
89 | /* COMPARE FUNCTIONS */ |
94
57ea041df22f
renamed comparator to utils module and added copy functions
Mike Becker <universe@uap-core.de>
parents:
92
diff
changeset
|
90 | |
308
d6f580621512
renames ucx_strcmp() to ucx_cmp_str()
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
91 | int ucx_cmp_str(const void *s1, const void *s2, void *data) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
92 | return strcmp((const char*)s1, (const char*)s2); |
89 | 93 | } |
94 | ||
309
4355c6039a28
renames ucx_strncmp() to ucx_cmp_strn()
Mike Becker <universe@uap-core.de>
parents:
308
diff
changeset
|
95 | int ucx_cmp_strn(const void *s1, const void *s2, void *n) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
96 | return strncmp((const char*)s1, (const char*)s2, *((size_t*) n)); |
89 | 97 | } |
98 | ||
310
b09677d72413
renames ucx_sstrcmp() to ucx_cmp_sstr()
Mike Becker <universe@uap-core.de>
parents:
309
diff
changeset
|
99 | int ucx_cmp_sstr(const void *s1, const void *s2, void *data) { |
292
d9abf53b8397
adds ucx_sstrcmp() compare function to utils.h
Mike Becker <universe@uap-core.de>
parents:
286
diff
changeset
|
100 | sstr_t a = *(const sstr_t*) s1; |
d9abf53b8397
adds ucx_sstrcmp() compare function to utils.h
Mike Becker <universe@uap-core.de>
parents:
286
diff
changeset
|
101 | sstr_t b = *(const sstr_t*) s2; |
d9abf53b8397
adds ucx_sstrcmp() compare function to utils.h
Mike Becker <universe@uap-core.de>
parents:
286
diff
changeset
|
102 | return sstrcmp(a, b); |
d9abf53b8397
adds ucx_sstrcmp() compare function to utils.h
Mike Becker <universe@uap-core.de>
parents:
286
diff
changeset
|
103 | } |
d9abf53b8397
adds ucx_sstrcmp() compare function to utils.h
Mike Becker <universe@uap-core.de>
parents:
286
diff
changeset
|
104 | |
314
5d28dc8f0765
renames int and longint distance and compare functions according to the new scheme
Mike Becker <universe@uap-core.de>
parents:
313
diff
changeset
|
105 | int ucx_cmp_int(const void *i1, const void *i2, void *data) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
106 | int a = *((const int*) i1); |
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
107 | int b = *((const int*) i2); |
89 | 108 | if (a == b) { |
109 | return 0; | |
110 | } else { | |
111 | return a < b ? -1 : 1; | |
112 | } | |
113 | } | |
114 | ||
314
5d28dc8f0765
renames int and longint distance and compare functions according to the new scheme
Mike Becker <universe@uap-core.de>
parents:
313
diff
changeset
|
115 | int ucx_cmp_longint(const void *i1, const void *i2, void *data) { |
285
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
116 | int a = *((const long int*) i1); |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
117 | int b = *((const long int*) i2); |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
118 | if (a == b) { |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
119 | return 0; |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
120 | } else { |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
121 | return a < b ? -1 : 1; |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
122 | } |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
123 | } |
7be3ae7ffb58
adds ucx_longintcmp() compare function
Mike Becker <universe@uap-core.de>
parents:
259
diff
changeset
|
124 | |
314
5d28dc8f0765
renames int and longint distance and compare functions according to the new scheme
Mike Becker <universe@uap-core.de>
parents:
313
diff
changeset
|
125 | intmax_t ucx_dist_int(const void *i1, const void *i2, void *data) { |
286
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
126 | intmax_t a = *((const int*) i1); |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
127 | intmax_t b = *((const int*) i2); |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
128 | return a - b; |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
129 | } |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
130 | |
314
5d28dc8f0765
renames int and longint distance and compare functions according to the new scheme
Mike Becker <universe@uap-core.de>
parents:
313
diff
changeset
|
131 | intmax_t ucx_dist_longint(const void *i1, const void *i2, void *data) { |
286
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
132 | intmax_t a = *((const long int*) i1); |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
133 | intmax_t b = *((const long int*) i2); |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
134 | return a - b; |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
135 | } |
85f55abea563
adds distance functions for integers as utils
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
136 | |
313
b7753273f0fd
renames ucx_doublecmp() and ucx_floatcmp() to ucx_cmp_double() and ucx_cmp_float()
Mike Becker <universe@uap-core.de>
parents:
312
diff
changeset
|
137 | int ucx_cmp_float(const void *f1, const void *f2, void *epsilon) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
138 | float a = *((const float*) f1); |
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
139 | float b = *((const float*) f2); |
92
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
140 | float e = !epsilon ? 1e-6f : *((float*)epsilon); |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
141 | if (fabsf(a - b) < e) { |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
142 | return 0; |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
143 | } else { |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
144 | return a < b ? -1 : 1; |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
145 | } |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
146 | } |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
147 | |
313
b7753273f0fd
renames ucx_doublecmp() and ucx_floatcmp() to ucx_cmp_double() and ucx_cmp_float()
Mike Becker <universe@uap-core.de>
parents:
312
diff
changeset
|
148 | int ucx_cmp_double(const void *d1, const void *d2, void *epsilon) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
149 | double a = *((const double*) d1); |
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
150 | double b = *((const double*) d2); |
92
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
151 | double e = !epsilon ? 1e-14 : *((double*)epsilon); |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
152 | if (fabs(a - b) < e) { |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
153 | return 0; |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
154 | } else { |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
155 | return a < b ? -1 : 1; |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
156 | } |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
157 | } |
7625a8efcc97
added floating point comparators
Mike Becker <universe@uap-core.de>
parents:
91
diff
changeset
|
158 | |
312
e1e3b768ae8b
renames ucx_ptrcmp() to ucx_cmp_ptr()
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
159 | int ucx_cmp_ptr(const void *ptr1, const void *ptr2, void *data) { |
244
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
160 | const intptr_t p1 = (const intptr_t) ptr1; |
98dc2d3a9b1d
adds const qualifiers to compare, distance and copy function signatures
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
161 | const intptr_t p2 = (const intptr_t) ptr2; |
194
0c1b7676e74c
finalized AVL tree interface + added implementation skeleton + fixed ucx_ptrcmp()
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
162 | if (p1 == p2) { |
89 | 163 | return 0; |
164 | } else { | |
194
0c1b7676e74c
finalized AVL tree interface + added implementation skeleton + fixed ucx_ptrcmp()
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
165 | return p1 < p2 ? -1 : 1; |
89 | 166 | } |
167 | } | |
91
91595a45fad6
added memcmp to the comparator module
Mike Becker <universe@uap-core.de>
parents:
89
diff
changeset
|
168 | |
311
e1f3248576bc
renames ucx_memcmp() to ucx_cmp_mem()
Mike Becker <universe@uap-core.de>
parents:
310
diff
changeset
|
169 | int ucx_cmp_mem(const void *ptr1, const void *ptr2, void *n) { |
91
91595a45fad6
added memcmp to the comparator module
Mike Becker <universe@uap-core.de>
parents:
89
diff
changeset
|
170 | return memcmp(ptr1, ptr2, *((size_t*)n)); |
91595a45fad6
added memcmp to the comparator module
Mike Becker <universe@uap-core.de>
parents:
89
diff
changeset
|
171 | } |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
172 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
173 | /* PRINTF FUNCTIONS */ |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
174 | |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
175 | #ifdef va_copy |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
176 | #define UCX_PRINTF_BUFSIZE 256 |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
177 | #else |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
178 | #pragma message("WARNING: C99 va_copy macro not supported by this platform" \ |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
179 | " - limiting ucx_*printf to 2 KiB") |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
180 | #define UCX_PRINTF_BUFSIZE 0x800 |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
181 | #endif |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
182 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
183 | int ucx_fprintf(void *stream, write_func wfc, const char *fmt, ...) { |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
184 | int ret; |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
185 | va_list ap; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
186 | va_start(ap, fmt); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
187 | ret = ucx_vfprintf(stream, wfc, fmt, ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
188 | va_end(ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
189 | return ret; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
190 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
191 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
192 | int ucx_vfprintf(void *stream, write_func wfc, const char *fmt, va_list ap) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
193 | char buf[UCX_PRINTF_BUFSIZE]; |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
194 | #ifdef va_copy |
144
b6dcc9d112eb
fixed printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
195 | va_list ap2; |
b6dcc9d112eb
fixed printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
196 | va_copy(ap2, ap); |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
197 | int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
198 | if (ret < 0) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
199 | return ret; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
200 | } else if (ret < UCX_PRINTF_BUFSIZE) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
201 | return (int)wfc(buf, 1, ret, stream); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
202 | } else { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
203 | if (ret == INT_MAX) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
204 | errno = ENOMEM; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
205 | return -1; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
206 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
207 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
208 | int len = ret + 1; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
209 | char *newbuf = (char*)malloc(len); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
210 | if (!newbuf) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
211 | return -1; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
212 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
213 | |
144
b6dcc9d112eb
fixed printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
214 | ret = vsnprintf(newbuf, len, fmt, ap2); |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
215 | if (ret > 0) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
216 | ret = (int)wfc(newbuf, 1, ret, stream); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
217 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
218 | free(newbuf); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
219 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
220 | return ret; |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
221 | #else |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
222 | int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap); |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
223 | if (ret < 0) { |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
224 | return ret; |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
225 | } else if (ret < UCX_PRINTF_BUFSIZE) { |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
226 | return (int)wfc(buf, 1, ret, stream); |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
227 | } else { |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
228 | errno = ENOMEM; |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
229 | return -1; |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
230 | } |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
231 | #endif |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
232 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
233 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
234 | sstr_t ucx_asprintf(UcxAllocator *allocator, const char *fmt, ...) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
235 | va_list ap; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
236 | sstr_t ret; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
237 | va_start(ap, fmt); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
238 | ret = ucx_vasprintf(allocator, fmt, ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
239 | va_end(ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
240 | return ret; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
241 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
242 | |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
243 | sstr_t ucx_vasprintf(UcxAllocator *a, const char *fmt, va_list ap) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
244 | sstr_t s; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
245 | s.ptr = NULL; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
246 | s.length = 0; |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
247 | char buf[UCX_PRINTF_BUFSIZE]; |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
248 | #ifdef va_copy |
144
b6dcc9d112eb
fixed printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
249 | va_list ap2; |
b6dcc9d112eb
fixed printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
250 | va_copy(ap2, ap); |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
251 | int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap); |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
252 | if (ret > 0 && ret < UCX_PRINTF_BUFSIZE) { |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
253 | s.ptr = (char*)almalloc(a, ret + 1); |
174
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
254 | if (s.ptr) { |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
255 | s.length = (size_t)ret; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
256 | memcpy(s.ptr, buf, ret); |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
257 | s.ptr[s.length] = '\0'; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
258 | } |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
259 | } else if (ret == INT_MAX) { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
260 | errno = ENOMEM; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
261 | } else { |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
262 | int len = ret + 1; |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
263 | s.ptr = (char*)almalloc(a, len); |
174
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
264 | if (s.ptr) { |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
265 | ret = vsnprintf(s.ptr, len, fmt, ap2); |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
266 | if (ret < 0) { |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
267 | free(s.ptr); |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
268 | s.ptr = NULL; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
269 | } else { |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
270 | s.length = (size_t)ret; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
271 | } |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
272 | } |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
273 | } |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
274 | #else |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
275 | int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap); |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
276 | if (ret > 0 && ret < UCX_PRINTF_BUFSIZE) { |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
277 | s.ptr = (char*)almalloc(a, ret + 1); |
174
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
278 | if (s.ptr) { |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
279 | s.length = (size_t)ret; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
280 | memcpy(s.ptr, buf, ret); |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
281 | s.ptr[s.length] = '\0'; |
bbfe511cfddb
fixed missing malloc return value validation in ucx_vasprintf
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
282 | } |
150
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
283 | } else { |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
284 | errno = ENOMEM; |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
285 | } |
1cf2eabf94ed
fixes for ultra fail not C99 supporting VC wannebe compiler
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
286 | #endif |
142
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
287 | return s; |
ee8cb27d8b8e
added printf functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
140
diff
changeset
|
288 | } |