*** empty log message ***

This commit is contained in:
2005-12-05 15:11:29 +00:00
parent a9d96b387a
commit 86de8c2da3
18 changed files with 72 additions and 72 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: init.c,v 1.10 2005-09-21 11:52:36 bacon Exp $
* $Id: init.c,v 1.11 2005-12-05 15:11:29 bacon Exp $
*/
#include <xp/lsp/lsp.h>
@ -15,12 +15,12 @@ xp_lsp_t* xp_lsp_open (xp_lsp_t* lsp,
if (lsp == XP_NULL) {
lsp = (xp_lsp_t*)xp_malloc(xp_sizeof(xp_lsp_t));
if (lsp == XP_NULL) return lsp;
lsp->__malloced = xp_true;
lsp->__dynamic = xp_true;
}
else lsp->__malloced = xp_false;
else lsp->__dynamic = xp_false;
if (xp_lsp_token_open(&lsp->token, 0) == XP_NULL) {
if (lsp->__malloced) xp_free (lsp);
if (lsp->__dynamic) xp_free (lsp);
return XP_NULL;
}
@ -37,14 +37,14 @@ xp_lsp_t* xp_lsp_open (xp_lsp_t* lsp,
lsp->mem = xp_lsp_mem_new (mem_ubound, mem_ubound_inc);
if (lsp->mem == XP_NULL) {
xp_lsp_token_close (&lsp->token);
if (lsp->__malloced) xp_free (lsp);
if (lsp->__dynamic) xp_free (lsp);
return XP_NULL;
}
if (__add_builtin_prims(lsp) == -1) {
xp_lsp_mem_free (lsp->mem);
xp_lsp_token_close (&lsp->token);
if (lsp->__malloced) xp_free (lsp);
if (lsp->__dynamic) xp_free (lsp);
return XP_NULL;
}
@ -59,7 +59,7 @@ void xp_lsp_close (xp_lsp_t* lsp)
xp_assert (lsp != XP_NULL);
xp_lsp_mem_free (lsp->mem);
xp_lsp_token_close (&lsp->token);
if (lsp->__malloced) xp_free (lsp);
if (lsp->__dynamic) xp_free (lsp);
}
int xp_lsp_attach_input (xp_lsp_t* lsp, xp_lsp_io_t input, void* arg)

View File

@ -1,5 +1,5 @@
/*
* $Id: lsp.h,v 1.19 2005-10-19 15:44:29 bacon Exp $
* $Id: lsp.h,v 1.20 2005-12-05 15:11:29 bacon Exp $
*/
#ifndef _XP_LSP_LSP_H_
@ -91,7 +91,7 @@ struct xp_lsp_t
/* memory manager */
xp_lsp_mem_t* mem;
xp_bool_t __malloced;
xp_bool_t __dynamic;
};
#ifdef __cplusplus

View File

@ -1,5 +1,5 @@
/*
* $Id: name.c,v 1.2 2005-09-18 11:34:35 bacon Exp $
* $Id: name.c,v 1.3 2005-12-05 15:11:29 bacon Exp $
*/
#include <xp/lsp/name.h>
@ -16,9 +16,9 @@ xp_lsp_name_t* xp_lsp_name_open (
name = (xp_lsp_name_t*)
xp_malloc (xp_sizeof(xp_lsp_name_t));
if (name == XP_NULL) return XP_NULL;
name->__malloced = xp_true;
name->__dynamic = xp_true;
}
else name->__malloced = xp_false;
else name->__dynamic = xp_false;
if (capacity < xp_countof(name->static_buffer)) {
name->buffer = name->static_buffer;
@ -27,7 +27,7 @@ xp_lsp_name_t* xp_lsp_name_open (
name->buffer = (xp_char_t*)
xp_malloc ((capacity + 1) * xp_sizeof(xp_char_t));
if (name->buffer == XP_NULL) {
if (name->__malloced) xp_free (name);
if (name->__dynamic) xp_free (name);
return XP_NULL;
}
}
@ -45,7 +45,7 @@ void xp_lsp_name_close (xp_lsp_name_t* name)
xp_assert (name->buffer != name->static_buffer);
xp_free (name->buffer);
}
if (name->__malloced) xp_free (name);
if (name->__dynamic) xp_free (name);
}
int xp_lsp_name_addc (xp_lsp_name_t* name, xp_cint_t c)

View File

@ -1,5 +1,5 @@
/*
* $Id: name.h,v 1.2 2005-09-18 10:18:35 bacon Exp $
* $Id: name.h,v 1.3 2005-12-05 15:11:29 bacon Exp $
*/
#ifndef _XP_LSP_NAME_H_
@ -14,7 +14,7 @@ struct xp_lsp_name_t
xp_word_t size;
xp_char_t* buffer;
xp_char_t static_buffer[128];
xp_bool_t __malloced;
xp_bool_t __dynamic;
};
typedef struct xp_lsp_name_t xp_lsp_name_t;

View File

@ -1,5 +1,5 @@
/*
* $Id: token.c,v 1.11 2005-09-18 08:10:50 bacon Exp $
* $Id: token.c,v 1.12 2005-12-05 15:11:29 bacon Exp $
*/
#include <xp/lsp/token.h>
@ -12,12 +12,12 @@ xp_lsp_token_t* xp_lsp_token_open (
token = (xp_lsp_token_t*)
xp_malloc (xp_sizeof(xp_lsp_token_t));
if (token == XP_NULL) return XP_NULL;
token->__malloced = xp_true;
token->__dynamic = xp_true;
}
else token->__malloced = xp_false;
else token->__dynamic = xp_false;
if (xp_lsp_name_open(&token->name, capacity) == XP_NULL) {
if (token->__malloced) xp_free (token);
if (token->__dynamic) xp_free (token);
return XP_NULL;
}
@ -32,7 +32,7 @@ xp_lsp_token_t* xp_lsp_token_open (
void xp_lsp_token_close (xp_lsp_token_t* token)
{
xp_lsp_name_close (&token->name);
if (token->__malloced) xp_free (token);
if (token->__dynamic) xp_free (token);
}
int xp_lsp_token_addc (xp_lsp_token_t* token, xp_cint_t c)

View File

@ -1,5 +1,5 @@
/*
* $Id: token.h,v 1.10 2005-09-20 11:19:15 bacon Exp $
* $Id: token.h,v 1.11 2005-12-05 15:11:29 bacon Exp $
*/
#ifndef _XP_LSP_TOKEN_H_
@ -21,7 +21,7 @@ struct xp_lsp_token_t
xp_lsp_real_t rvalue;
xp_lsp_name_t name;
xp_bool_t __malloced;
xp_bool_t __dynamic;
};
typedef struct xp_lsp_token_t xp_lsp_token_t;