libcutils

← Back to log@ e24ed58

added consuming string conversion functions, addded pkg-config and install rules to meson

AuthorKonata <konata@posteo.jp>
Date
Commite24ed582a625cf1d632d7ce56129c520535edf49
Parente273cb9
5 files changed, 28 insertions(+), 3 deletions(-)
▾Minclude/cutils/dyn_string.h
+2@ e24ed58@ master
@@ -32,7 +32,9 @@ size_t* string_find_char(const String* haystack, const char needle);
3232
3333 bool string_concat(String* string, const String* other);
3434 String* from_cstring(const char* cstring);
35+String* from_cstring_del(char* cstring);
3536 char* to_cstring(const String* string);
37+char* to_cstring_del(String* string);
3638
3739
3840 #endif /* DYN_STRING_H */
▾Minclude/meson.build
+1@ e24ed58@ master
@@ -1 +1,2 @@
11 inc = include_directories('.')
2+install_headers('cutils/cutils.h', 'cutils/dyn_string.h', 'cutils/vector.h', 'cutils/misc.h', subdir: 'cutils')
▾Mmeson.build
+7@ e24ed58@ master
@@ -5,3 +5,10 @@ CFLAGS = ['-std=c89', '-fstrict-aliasing', '-fPIC'] + WARNINGS
55
66 subdir('include')
77 subdir('src')
8+
9+
10+pkg = import('pkgconfig')
11+libs = 'cutils'
12+headers = 'include'
13+
14+pkg.generate(libraries : cutils_lib, subdirs : headers, version : '1.0', name : 'libcutils', filebase : 'cutils', description : 'Collection of some portable helper function and data structures in C89.')
▾Msrc/dyn_string.c
+14@ e24ed58@ master
@@ -119,6 +119,13 @@ String* from_cstring(const char* cstring)
119119
120120 }
121121
122+String* from_cstring_del(char* cstring)
123+{
124+ String* ret = from_cstring(cstring);
125+ free(cstring);
126+ return ret;
127+}
128+
122129 char* to_cstring(const String* string)
123130 {
124131 char* cstring = malloc(string->length+1);
@@ -127,3 +134,10 @@ char* to_cstring(const String* string)
127134
128135 return cstring;
129136 }
137+
138+char* to_cstring_del(String* string)
139+{
140+ char* ret = to_cstring(string);
141+ delete_string(string);
142+ return ret;
143+}
▾Msrc/meson.build
+4-3@ e24ed58@ master
@@ -1,7 +1,8 @@
11 src = ['vector.c', 'dyn_string.c', 'misc.c']
22 srctest = src + ['test.c']
33
4-lib = shared_library('cutils', src, include_directories : inc)
5-cutils_dep = declare_dependency(link_with : lib, include_directories : inc)
4+cutils_lib = library('cutils', src, include_directories : inc, install: true)
65
7-executable('test_cutils', srctest, include_directories : inc, c_args: CFLAGS )
6+cutils_dep = declare_dependency(link_with : cutils_lib, include_directories : inc)
7+
8+executable('test_cutils', srctest, include_directories : inc, c_args: CFLAGS )