shithub: sl

Info  •  Files  •  Log  •  Branches

remove a few unused functions

--- a/cvalues.c

+++ b/cvalues.c

@@ -132,15 +132,6 @@

 	return tagptr(pcv, TAG_CVALUE);

 }

-value_t

-cvalue_from_data(fltype_t *type, void *data, size_t sz)

-{

-	value_t cv;

-	cv = cvalue(type, sz);

-	memcpy(cptr(cv), data, sz);

-	return cv;

-}

-

 // this effectively dereferences a pointer

 // just like *p in C, it only removes a level of indirection from the type,

 // it doesn't copy any data.

@@ -378,38 +369,6 @@

 		return conv_to_int64(cp_data(cp), cp_numtype(cp));

 	}

 	type_error("number", n);

-}

-

-int

-cvalue_enum_init(fltype_t *ft, value_t arg, void *dest)

-{

-	int n;

-	value_t syms;

-	value_t type = ft->type;

-

-	syms = car(cdr(type));

-	if(!isvector(syms))

-		type_error("vector", syms);

-	if(issymbol(arg)){

-		for(n = 0; n < (int)vector_size(syms); n++){

-			if(vector_elt(syms, n) == arg){

-				*(int*)dest = n;

-				return 0;

-			}

-		}

-		lerrorf(FL_ArgError, "invalid enum value");

-	}

-	if(isfixnum(arg))

-		n = (int)numval(arg);

-	else if(iscprim(arg)){

-		cprim_t *cp = ptr(arg);

-		n = conv_to_int32(cp_data(cp), cp_numtype(cp));

-	}else

-		type_error("number", arg);

-	if((unsigned)n >= vector_size(syms))

-		lerrorf(FL_ArgError, "value out of range");

-	*(int*)dest = n;

-	return 0;

 }

 int

--- a/cvalues.h

+++ b/cvalues.h

@@ -19,7 +19,6 @@

 value_t cvalue_(fltype_t *type, size_t sz, bool nofinalizer);

 #define cvalue(type, sz) cvalue_(type, sz, false)

 #define cvalue_nofinalizer(type, sz) cvalue_(type, sz, true)

-value_t cvalue_from_data(fltype_t *type, void *data, size_t sz);

 value_t cvalue_from_ref(fltype_t *type, void *ptr, size_t sz, value_t parent);

 value_t cvalue_string(size_t sz);

 value_t cvalue_static_cstring(const char *str);

@@ -31,7 +30,6 @@

 value_t size_wrap(size_t sz);

 size_t tosize(value_t n);

 off_t tooffset(value_t n);

-int cvalue_enum_init(fltype_t *ft, value_t arg, void *dest);

 int isarray(value_t v) fl_purefn;

 int cvalue_array_init(fltype_t *ft, value_t arg, void *dest);

 size_t cvalue_arraylen(value_t v) fl_purefn;

--- a/htable.inc

+++ b/htable.inc

@@ -134,11 +134,3 @@

     }

     return 0;

 }

-

-void

-HTNAME(_adjoin)(htable_t *h, void *key, void *val)

-{

-    void **bp = HTNAME(_lookup_bp)(h, key);

-    if(*bp == HT_NOTFOUND)

-        *bp = val;

-}

--- a/htableh.inc

+++ b/htableh.inc

@@ -5,7 +5,6 @@

 #define HTPROT(HTNAME) \

 void *HTNAME##_get(htable_t *h, void *key) fl_purefn; \

 void HTNAME##_put(htable_t *h, void *key, void *val); \

-void HTNAME##_adjoin(htable_t *h, void *key, void *val); \

 int HTNAME##_has(htable_t *h, void *key) fl_purefn; \

 int HTNAME##_remove(htable_t *h, void *key); \

 void **HTNAME##_bp(htable_t *h, void *key);

--- a/ios.c

+++ b/ios.c

@@ -785,17 +785,6 @@

 }

 ios_t *

-ios_str(ios_t *s, char *str)

-{

-	size_t n = strlen(str);

-	if(ios_mem(s, n+1) == nil)

-		return nil;

-	ios_write(s, str, n+1);

-	ios_seek(s, 0);

-	return s;

-}

-

-ios_t *

 ios_static_buffer(ios_t *s, const uint8_t *buf, size_t sz)

 {

 	ios_mem(s, 0);

--- a/ios.h

+++ b/ios.h

@@ -92,7 +92,6 @@

 /* stream creation */

 ios_t *ios_file(ios_t *s, char *fname, int rd, int wr, int create, int trunc);

 ios_t *ios_mem(ios_t *s, size_t initsize);

-ios_t *ios_str(ios_t *s, char *str);

 ios_t *ios_static_buffer(ios_t *s, const uint8_t *buf, size_t sz);

 ios_t *ios_fd(ios_t *s, int fd, int isfile, int own);

 // todo: ios_socket