Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
conf.c mem.c
Log Message:
Wed Nov 26 21:07:16 2003 Michael Jennings (mej)
Working on cleaning up namespace issues.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/conf.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- conf.c 26 Nov 2003 22:19:44 -0000 1.12
+++ conf.c 27 Nov 2003 02:08:06 -0000 1.13
@@ -31,7 +31,7 @@
* @author Michael Jennings <[EMAIL PROTECTED]>
*/
-static const char cvs_ident[] = "$Id: conf.c,v 1.12 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: conf.c,v 1.13 2003/11/27 02:08:06 mej Exp $";
#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
# include <config.h>
@@ -39,10 +39,10 @@
#include <libast_internal.h>
-static conf_var_t *conf_new_var(void);
-static void conf_free_var(conf_var_t *);
-static char *conf_get_var(const char *);
-static void conf_put_var(char *, char *);
+static spifconf_var_t *spifconf_new_var(void);
+static void spifconf_free_var(spifconf_var_t *);
+static char *spifconf_get_var(const char *);
+static void spifconf_put_var(char *, char *);
static char *builtin_random(char *);
static char *builtin_exec(char *);
static char *builtin_get(char *);
@@ -54,9 +54,9 @@
static ctx_t *context;
static ctx_state_t *ctx_state;
-static conf_func_t *builtins;
+static spifconf_func_t *builtins;
static unsigned char ctx_cnt, ctx_idx, ctx_state_idx, ctx_state_cnt, fstate_cnt,
builtin_cnt, builtin_idx;
-static conf_var_t *conf_vars = NULL;
+static spifconf_var_t *spifconf_vars = NULL;
const char *true_vals[] = { "1", "on", "true", "yes" };
const char *false_vals[] = { "0", "off", "false", "no" };
@@ -65,10 +65,10 @@
unsigned char fstate_idx;
/***** The Config File Section *****/
-/* This function must be called before any other conf_*() function.
+/* This function must be called before any other spifconf_*() function.
Otherwise you will be bitten by dragons. That's life. */
void
-conf_init_subsystem(void)
+spifconf_init_subsystem(void)
{
/* Initialize the context list and establish a catch-all "null" context */
@@ -94,22 +94,22 @@
/* Initialize the builtin function table */
builtin_cnt = 10;
builtin_idx = 0;
- builtins = (conf_func_t *) MALLOC(sizeof(conf_func_t) * builtin_cnt);
- MEMSET(builtins, 0, sizeof(conf_func_t) * builtin_cnt);
+ builtins = (spifconf_func_t *) MALLOC(sizeof(spifconf_func_t) * builtin_cnt);
+ MEMSET(builtins, 0, sizeof(spifconf_func_t) * builtin_cnt);
/* Register the omni-present builtin functions */
- conf_register_builtin("appname", builtin_appname);
- conf_register_builtin("version", builtin_version);
- conf_register_builtin("exec", builtin_exec);
- conf_register_builtin("random", builtin_random);
- conf_register_builtin("get", builtin_get);
- conf_register_builtin("put", builtin_put);
- conf_register_builtin("dirscan", builtin_dirscan);
+ spifconf_register_builtin("appname", builtin_appname);
+ spifconf_register_builtin("version", builtin_version);
+ spifconf_register_builtin("exec", builtin_exec);
+ spifconf_register_builtin("random", builtin_random);
+ spifconf_register_builtin("get", builtin_get);
+ spifconf_register_builtin("put", builtin_put);
+ spifconf_register_builtin("dirscan", builtin_dirscan);
}
/* Register a new config file context */
unsigned char
-conf_register_context(char *name, ctx_handler_t handler)
+spifconf_register_context(char *name, ctx_handler_t handler)
{
if (strcasecmp(name, "null")) {
if (++ctx_idx == ctx_cnt) {
@@ -127,7 +127,7 @@
/* Register a new file state structure */
unsigned char
-conf_register_fstate(FILE * fp, char *path, char *outfile, unsigned long line,
unsigned char flags)
+spifconf_register_fstate(FILE * fp, char *path, char *outfile, unsigned long line,
unsigned char flags)
{
if (++fstate_idx == fstate_cnt) {
@@ -144,21 +144,21 @@
/* Register a new builtin function */
unsigned char
-conf_register_builtin(char *name, conf_func_ptr_t ptr)
+spifconf_register_builtin(char *name, spifconf_func_ptr_t ptr)
{
builtins[builtin_idx].name = STRDUP(name);
builtins[builtin_idx].ptr = ptr;
if (++builtin_idx == builtin_cnt) {
builtin_cnt *= 2;
- builtins = (conf_func_t *) REALLOC(builtins, sizeof(conf_func_t) *
builtin_cnt);
+ builtins = (spifconf_func_t *) REALLOC(builtins, sizeof(spifconf_func_t) *
builtin_cnt);
}
return (builtin_idx - 1);
}
/* Register a new config file context */
unsigned char
-conf_register_context_state(unsigned char ctx_id)
+spifconf_register_context_state(unsigned char ctx_id)
{
if (++ctx_state_idx == ctx_state_cnt) {
@@ -171,15 +171,15 @@
}
void
-conf_free_subsystem(void)
+spifconf_free_subsystem(void)
{
- conf_var_t *v, *tmp;
+ spifconf_var_t *v, *tmp;
unsigned long i;
- for (v = conf_vars; v;) {
+ for (v = spifconf_vars; v;) {
tmp = v;
v = v->next;
- conf_free_var(tmp);
+ spifconf_free_var(tmp);
}
for (i = 0; i < builtin_idx; i++) {
FREE(builtins[i].name);
@@ -193,18 +193,18 @@
FREE(context);
}
-static conf_var_t *
-conf_new_var(void)
+static spifconf_var_t *
+spifconf_new_var(void)
{
- conf_var_t *v;
+ spifconf_var_t *v;
- v = (conf_var_t *) MALLOC(sizeof(conf_var_t));
- MEMSET(v, 0, sizeof(conf_var_t));
+ v = (spifconf_var_t *) MALLOC(sizeof(spifconf_var_t));
+ MEMSET(v, 0, sizeof(spifconf_var_t));
return v;
}
static void
-conf_free_var(conf_var_t *v)
+spifconf_free_var(spifconf_var_t *v)
{
if (v->var) {
FREE(v->var);
@@ -216,12 +216,12 @@
}
static char *
-conf_get_var(const char *var)
+spifconf_get_var(const char *var)
{
- conf_var_t *v;
+ spifconf_var_t *v;
D_CONF(("var == \"%s\"\n", var));
- for (v = conf_vars; v; v = v->next) {
+ for (v = spifconf_vars; v; v = v->next) {
if (!strcmp(v->var, var)) {
D_CONF(("Found it at %010p: \"%s\" == \"%s\"\n", v, v->var, v->value));
return (v->value);
@@ -232,14 +232,14 @@
}
static void
-conf_put_var(char *var, char *val)
+spifconf_put_var(char *var, char *val)
{
- conf_var_t *v, *loc = NULL, *tmp;
+ spifconf_var_t *v, *loc = NULL, *tmp;
ASSERT(var != NULL);
D_CONF(("var == \"%s\", val == \"%s\"\n", var, val));
- for (v = conf_vars; v; loc = v, v = v->next) {
+ for (v = spifconf_vars; v; loc = v, v = v->next) {
int n;
n = strcmp(var, v->var);
@@ -254,9 +254,9 @@
if (loc) {
loc->next = v->next;
} else {
- conf_vars = v->next;
+ spifconf_vars = v->next;
}
- conf_free_var(v);
+ spifconf_free_var(v);
}
return;
} else if (n < 0) {
@@ -268,10 +268,10 @@
return;
}
D_CONF(("Inserting new var/val pair between \"%s\" and \"%s\"\n", ((loc) ?
loc->var : "-beginning-"), ((v) ? v->var : "-end-")));
- tmp = conf_new_var();
+ tmp = spifconf_new_var();
if (loc == NULL) {
- tmp->next = conf_vars;
- conf_vars = tmp;
+ tmp->next = spifconf_vars;
+ spifconf_vars = tmp;
} else {
tmp->next = loc->next;
loc->next = tmp;
@@ -366,7 +366,7 @@
} else {
f = NULL;
}
- v = conf_get_var(s);
+ v = spifconf_get_var(s);
FREE(s);
if (v) {
if (f) {
@@ -394,7 +394,7 @@
D_PARSE(("builtin_put(%s) called\n", param));
var = get_word(1, param);
val = get_word(2, param);
- conf_put_var(var, val);
+ spifconf_put_var(var, val);
return NULL;
}
@@ -470,10 +470,10 @@
return (STRDUP(buff));
}
-/* shell_expand() takes care of shell variable expansion, quote conventions,
+/* spifconf_shell_expand() takes care of shell variable expansion, quote conventions,
calling of built-in functions, etc. -- mej */
char *
-shell_expand(char *s)
+spifconf_shell_expand(char *s)
{
register char *tmp;
register char *pbuff = s, *tmp1;
@@ -575,7 +575,7 @@
print_error("parse error in file %s, line %lu: Mismatched
parentheses\n", file_peek_path(), file_peek_line());
return ((char *) NULL);
}
- Command = shell_expand(Command);
+ Command = spifconf_shell_expand(Command);
Output = (builtins[k].ptr) (Command);
FREE(Command);
if (Output) {
@@ -605,7 +605,7 @@
}
ASSERT_RVAL(l < CONFIG_BUFF, NULL);
Command[l] = 0;
- Command = shell_expand(Command);
+ Command = spifconf_shell_expand(Command);
Output = builtin_exec(Command);
FREE(Command);
if (Output) {
@@ -688,7 +688,7 @@
ASSERT_RVAL(j < CONFIG_BUFF, NULL);
newbuff[j] = 0;
- D_PARSE(("shell_expand(%s) returning \"%s\"\n", s, newbuff));
+ D_PARSE(("spifconf_shell_expand(%s) returning \"%s\"\n", s, newbuff));
D_PARSE((" strlen(s) == %lu, strlen(newbuff) == %lu, j == %lu\n", strlen(s),
strlen(newbuff), j));
strcpy(s, newbuff);
@@ -702,7 +702,7 @@
If it can't find a config file, it displays a warning but continues. -- mej */
char *
-conf_find_file(const char *file, const char *dir, const char *pathlist)
+spifconf_find_file(const char *file, const char *dir, const char *pathlist)
{
static char name[PATH_MAX], full_path[PATH_MAX];
@@ -715,7 +715,7 @@
REQUIRE_RVAL(file != NULL, NULL);
getcwd(name, PATH_MAX);
- D_CONF(("conf_find_file(\"%s\", \"%s\", \"%s\") called from directory \"%s\".\n",
file, NONULL(dir), NONULL(pathlist), name));
+ D_CONF(("spifconf_find_file(\"%s\", \"%s\", \"%s\") called from directory
\"%s\".\n", file, NONULL(dir), NONULL(pathlist), name));
if (dir) {
strcpy(name, dir);
@@ -765,12 +765,12 @@
}
}
}
- D_CONF(("conf_find_file(): File \"%s\" not found in path.\n", name));
+ D_CONF(("spifconf_find_file(): File \"%s\" not found in path.\n", name));
return ((char *) NULL);
}
FILE *
-open_config_file(char *name)
+spifconf_open_file(char *name)
{
FILE *fp;
spif_cmp_t ver;
@@ -801,9 +801,9 @@
return (fp);
}
-#define CONF_PARSE_RET() do {if (!fp) {file_pop(); ctx_end();} return;} while (0)
+#define SPIFCONF_PARSE_RET() do {if (!fp) {file_pop(); ctx_end();} return;} while (0)
void
-conf_parse_line(FILE * fp, char *buff)
+spifconf_parse_line(FILE * fp, char *buff)
{
register unsigned long i = 0;
unsigned char id;
@@ -812,14 +812,14 @@
ASSERT(buff != NULL);
if (!(*buff) || *buff == '\n' || *buff == '#' || *buff == '<') {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
if (fp == NULL) {
file_push(NULL, "<argv>", NULL, 0, 0);
ctx_begin(1);
buff = get_pword(2, buff);
if (!buff) {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
}
id = ctx_peek_id();
@@ -828,15 +828,15 @@
switch (*buff) {
case '#':
case '\0':
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
case '%':
if (!BEG_STRCASECMP(get_pword(1, buff + 1), "include ")) {
char *path;
FILE *fp;
- shell_expand(buff);
+ spifconf_shell_expand(buff);
path = get_word(2, buff + 1);
- if ((fp = open_config_file(path)) == NULL) {
+ if ((fp = spifconf_open_file(path)) == NULL) {
print_error("Parsing file %s, line %lu: Unable to locate
%%included config file %s (%s), continuing\n", file_peek_path(),
file_peek_line(), path, strerror(errno));
} else {
@@ -848,7 +848,7 @@
FILE *fp;
if (file_peek_preproc()) {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
strcpy(fname, "Eterm-preproc-");
fd = libast_temp_file(fname, PATH_MAX);
@@ -864,14 +864,14 @@
}
} else {
if (file_peek_skip()) {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
- shell_expand(buff);
+ spifconf_shell_expand(buff);
}
break;
case 'b':
if (file_peek_skip()) {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
if (!BEG_STRCASECMP(buff, "begin ")) {
ctx_begin(2);
@@ -886,18 +886,18 @@
/* Intentional pass-through */
default:
if (file_peek_skip()) {
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
- shell_expand(buff);
+ spifconf_shell_expand(buff);
ctx_poke_state((*ctx_id_to_func(id)) (buff, ctx_peek_state()));
}
- CONF_PARSE_RET();
+ SPIFCONF_PARSE_RET();
}
-#undef CONF_PARSE_RET
+#undef SPIFCONF_PARSE_RET
char *
-conf_parse(char *conf_name, const char *dir, const char *path)
+spifconf_parse(char *conf_name, const char *dir, const char *path)
{
FILE *fp;
char *name = NULL, *p = ".";
@@ -907,7 +907,7 @@
*orig_dir = 0;
if (path) {
- if ((name = conf_find_file(conf_name, dir, path)) != NULL) {
+ if ((name = spifconf_find_file(conf_name, dir, path)) != NULL) {
if ((p = strrchr(name, '/')) != NULL) {
getcwd(orig_dir, PATH_MAX);
*p = 0;
@@ -920,10 +920,10 @@
return NULL;
}
}
- if ((fp = open_config_file(conf_name)) == NULL) {
+ if ((fp = spifconf_open_file(conf_name)) == NULL) {
return NULL;
}
- file_push(fp, conf_name, NULL, 1, 0); /* Line count starts at 1 because
open_config_file() parses the first line */
+ file_push(fp, conf_name, NULL, 1, 0); /* Line count starts at 1 because
spifconf_open_file() parses the first line */
for (; fstate_idx > 0;) {
for (; fgets(buff, CONFIG_BUFF, file_peek_fp());) {
@@ -933,7 +933,7 @@
for (; fgets(buff, CONFIG_BUFF, file_peek_fp()) && !strrchr(buff,
'\n'););
continue;
}
- conf_parse_line(fp, buff);
+ spifconf_parse_line(fp, buff);
}
fclose(file_peek_fp());
if (file_peek_preproc()) {
@@ -953,9 +953,9 @@
parse_null(char *buff, void *state)
{
- if (*buff == CONF_BEGIN_CHAR) {
+ if (*buff == SPIFCONF_BEGIN_CHAR) {
return (NULL);
- } else if (*buff == CONF_END_CHAR) {
+ } else if (*buff == SPIFCONF_END_CHAR) {
return (NULL);
} else {
print_error("Parse error in file %s, line %lu: Not allowed in \"null\"
context: \"%s\"\n", file_peek_path(), file_peek_line(),
@@ -997,7 +997,7 @@
* this information, one for each file. LibAST uses a structure array
* called the file state stack.
*
- * When config file parsing is initiated by a call to conf_parse(),
+ * When config file parsing is initiated by a call to spifconf_parse(),
* the information for that file is pushed onto the empty stack. For
* monolithic config files, the stack retains its height throughout
* the parsing cycle. However, if an @c %include directive is
@@ -1054,15 +1054,15 @@
* is printed, and the parser skips the entire context (until the
* next @c end keyword). Otherwise, go to the next step.
* -# The registered context handler function is called. The value
- * #CONF_BEGIN_STRING is passed as the first parameter (which I'll
+ * #SPIFCONF_BEGIN_STRING is passed as the first parameter (which I'll
* call @a buff ), and NULL is passed as the second parameter
* (which I'll call @a state ).
* -# The context handler should handle this using a statement similar
* to the following:
* @code
- * if (*buff == CONF_BEGIN_CHAR) {
+ * if (*buff == SPIFCONF_BEGIN_CHAR) {
* @endcode
- * (The value of #CONF_BEGIN_CHAR is such that it should never
+ * (The value of #SPIFCONF_BEGIN_CHAR is such that it should never
* occur in normal config file text.)
* If the handler does not require any persistent state information
* to be kept between calls, it may simply return NULL here.
@@ -1079,11 +1079,11 @@
* state information pointer. The handler, of course, should
* continue returning the state information pointer.
* -# Once the @c end keyword is encountered, the context handler is
- * called with #CONF_END_STRING as the first parameter and the
+ * called with #SPIFCONF_END_STRING as the first parameter and the
* state information pointer as the second parameter. This
* situation should be caught by some code like this:
* @code
- * if (*buff == CONF_END_CHAR) {
+ * if (*buff == SPIFCONF_END_CHAR) {
* @endcode
* Again, the handler should simply return NULL if no state
* information is being kept. Otherwise, any post-processing or
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/mem.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- mem.c 26 Nov 2003 22:19:44 -0000 1.13
+++ mem.c 27 Nov 2003 02:08:06 -0000 1.14
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 1997-2003, Michael Jennings
*
@@ -29,11 +28,11 @@
* This file contains the memory management subsystem.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.13 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.14 $
+ * $Date: 2003/11/27 02:08:06 $
*/
-static const char cvs_ident[] = "$Id: mem.c,v 1.13 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: mem.c,v 1.14 2003/11/27 02:08:06 mej Exp $";
#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
# include <config.h>
@@ -116,7 +115,7 @@
* @ingroup DOXGRP_MEM
*/
void
-memrec_init(void)
+spifmem_init(void)
{
D_MEM(("Constructing memory allocation records\n"));
malloc_rec.ptrs = (ptr_t *) malloc(sizeof(ptr_t));
@@ -408,7 +407,7 @@
* @ingroup DOXGRP_MEM
*/
void *
-libast_malloc(const char *filename, unsigned long line, size_t size)
+spifmem_malloc(const char *filename, unsigned long line, size_t size)
{
void *temp;
@@ -450,7 +449,7 @@
* @ingroup DOXGRP_MEM
*/
void *
-libast_realloc(const char *var, const char *filename, unsigned long line, void *ptr,
size_t size)
+spifmem_realloc(const char *var, const char *filename, unsigned long line, void *ptr,
size_t size)
{
void *temp;
@@ -463,7 +462,7 @@
D_MEM(("Variable %s (%010p -> %lu) at %s:%lu\n", var, ptr, (unsigned long) size,
filename, line));
if (ptr == NULL) {
- temp = (void *) libast_malloc(__FILE__, __LINE__, size);
+ temp = (void *) spifmem_malloc(__FILE__, __LINE__, size);
} else {
temp = (void *) realloc(ptr, size);
ASSERT_RVAL(temp != NULL, ptr);
@@ -495,7 +494,7 @@
* @ingroup DOXGRP_MEM
*/
void *
-libast_calloc(const char *filename, unsigned long line, size_t count, size_t size)
+spifmem_calloc(const char *filename, unsigned long line, size_t count, size_t size)
{
void *temp;
@@ -532,7 +531,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_free(const char *var, const char *filename, unsigned long line, void *ptr)
+spifmem_free(const char *var, const char *filename, unsigned long line, void *ptr)
{
#if MALLOC_CALL_DEBUG
++free_count;
@@ -570,7 +569,7 @@
* @ingroup DOXGRP_MEM
*/
char *
-libast_strdup(const char *var, const char *filename, unsigned long line, const char
*str)
+spifmem_strdup(const char *var, const char *filename, unsigned long line, const char
*str)
{
register char *newstr;
register size_t len;
@@ -578,7 +577,7 @@
D_MEM(("Variable %s (%010p) at %s:%lu\n", var, str, filename, line));
len = strlen(str) + 1; /* Copy NUL byte also */
- newstr = (char *) libast_malloc(filename, line, len);
+ newstr = (char *) spifmem_malloc(filename, line, len);
strcpy(newstr, str);
return (newstr);
}
@@ -593,7 +592,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_dump_mem_tables(void)
+spifmem_dump_mem_tables(void)
{
fprintf(LIBAST_DEBUG_FD, "Dumping memory allocation table:\n");
memrec_dump_pointers(&malloc_rec);
@@ -625,7 +624,7 @@
* @ingroup DOXGRP_MEM
*/
Pixmap
-libast_x_create_pixmap(const char *filename, unsigned long line, Display * d,
Drawable win, unsigned int w, unsigned int h,
+spifmem_x_create_pixmap(const char *filename, unsigned long line, Display * d,
Drawable win, unsigned int w, unsigned int h,
unsigned int depth)
{
Pixmap p;
@@ -658,7 +657,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_x_free_pixmap(const char *var, const char *filename, unsigned long line,
Display * d, Pixmap p)
+spifmem_x_free_pixmap(const char *var, const char *filename, unsigned long line,
Display * d, Pixmap p)
{
D_MEM(("Freeing pixmap %s (0x%08x) at %s:%lu\n", var, p, filename, line));
if (p) {
@@ -689,7 +688,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_imlib_register_pixmap(const char *var, const char *filename, unsigned long
line, Pixmap p)
+spifmem_imlib_register_pixmap(const char *var, const char *filename, unsigned long
line, Pixmap p)
{
D_MEM(("Registering pixmap %s (0x%08x) created by Imlib2 at %s:%lu\n", var, p,
filename, line));
if (p) {
@@ -723,7 +722,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_imlib_free_pixmap(const char *var, const char *filename, unsigned long line,
Pixmap p)
+spifmem_imlib_free_pixmap(const char *var, const char *filename, unsigned long line,
Pixmap p)
{
D_MEM(("Freeing pixmap %s (0x%08x) at %s:%lu using Imlib2\n", var, p, filename,
line));
if (p) {
@@ -747,7 +746,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_dump_pixmap_tables(void)
+spifmem_dump_pixmap_tables(void)
{
fprintf(LIBAST_DEBUG_FD, "Dumping X11 Pixmap allocation table:\n");
memrec_dump_resources(&pixmap_rec);
@@ -778,7 +777,7 @@
* @ingroup DOXGRP_MEM
*/
GC
-libast_x_create_gc(const char *filename, unsigned long line, Display * d, Drawable
win, unsigned long mask, XGCValues * gcv)
+spifmem_x_create_gc(const char *filename, unsigned long line, Display * d, Drawable
win, unsigned long mask, XGCValues * gcv)
{
GC gc;
@@ -810,9 +809,9 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_x_free_gc(const char *var, const char *filename, unsigned long line, Display *
d, GC gc)
+spifmem_x_free_gc(const char *var, const char *filename, unsigned long line, Display
* d, GC gc)
{
- D_MEM(("libast_x_free_gc() called for variable %s (0x%08x) at %s:%lu\n", var, gc,
filename, line));
+ D_MEM(("spifmem_x_free_gc() called for variable %s (0x%08x) at %s:%lu\n", var,
gc, filename, line));
if (gc) {
if (DEBUG_LEVEL >= DEBUG_MEM) {
memrec_rem_var(&gc_rec, var, filename, line, (void *) gc);
@@ -833,7 +832,7 @@
* @ingroup DOXGRP_MEM
*/
void
-libast_dump_gc_tables(void)
+spifmem_dump_gc_tables(void)
{
fprintf(LIBAST_DEBUG_FD, "Dumping X11 GC allocation table:\n");
memrec_dump_resources(&gc_rec);
@@ -858,7 +857,7 @@
* @ingroup DOXGRP_MEM
*/
void
-free_array(void *list, size_t count)
+spiftool_free_array(void *list, size_t count)
{
register size_t i;
void **l = (void **) list;
@@ -920,19 +919,19 @@
*
* @code
* $ ./mem_example
- * [1045859036] mem.c | 246: libast_malloc(): 500 bytes requested at
mem_example.c:27
+ * [1045859036] mem.c | 246: spifmem_malloc(): 500 bytes requested at
mem_example.c:27
* [1045859036] mem.c | 74: memrec_add_var(): Adding variable (0x8049a20,
500 bytes) from mem_example.c:27.
* [1045859036] mem.c | 75: memrec_add_var(): Storing as pointer #1 at
0x8049c18 (from 0x8049c18).
- * [1045859036] mem.c | 329: libast_strdup(): Variable pointer (0x8049a20) at
mem_example.c:36
- * [1045859036] mem.c | 246: libast_malloc(): 16 bytes requested at
mem_example.c:36
+ * [1045859036] mem.c | 329: spifmem_strdup(): Variable pointer (0x8049a20)
at mem_example.c:36
+ * [1045859036] mem.c | 246: spifmem_malloc(): 16 bytes requested at
mem_example.c:36
* [1045859036] mem.c | 74: memrec_add_var(): Adding variable (0x8049c40, 16
bytes) from mem_example.c:36.
* [1045859036] mem.c | 75: memrec_add_var(): Storing as pointer #2 at
0x8049c7c (from 0x8049c58).
- * [1045859036] mem.c | 312: libast_free(): Variable dup (0x8049c40) at
mem_example.c:39
+ * [1045859036] mem.c | 312: spifmem_free(): Variable dup (0x8049c40) at
mem_example.c:39
* [1045859036] mem.c | 94: memrec_find_var(): Found pointer #2 stored at
0x8049c7c (from 0x8049c58)
* [1045859036] mem.c | 113: memrec_rem_var(): Removing variable dup
(0x8049c40) of size 16
- * [1045859036] mem.c | 312: libast_free(): Variable dup ( (nil)) at
mem_example.c:43
- * [1045859036] mem.c | 319: libast_free(): ERROR: Caught attempt to free
NULL pointer
- * [1045859036] mem.c | 268: libast_realloc(): Variable pointer (0x8049a20 ->
1000) at mem_example.c:46
+ * [1045859036] mem.c | 312: spifmem_free(): Variable dup ( (nil)) at
mem_example.c:43
+ * [1045859036] mem.c | 319: spifmem_free(): ERROR: Caught attempt to free
NULL pointer
+ * [1045859036] mem.c | 268: spifmem_realloc(): Variable pointer (0x8049a20
-> 1000) at mem_example.c:46
* [1045859036] mem.c | 94: memrec_find_var(): Found pointer #1 stored at
0x8049c58 (from 0x8049c58)
* [1045859036] mem.c | 132: memrec_chg_var(): Changing variable pointer
(0x8049a20, 500 -> 0x8049c80, 1000)
* Dumping memory allocation table:
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
