Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
array.c avl_tree.c conf.c debug.c dlinked_list.c file.c
linked_list.c mem.c msgs.c obj.c options.c regexp.c snprintf.c
socket.c str.c strings.c tok.c url.c
Log Message:
Thu Nov 27 00:22:16 2003 Michael Jennings (mej)
More namespace cleaning. Just one more set to go.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/array.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- array.c 26 Nov 2003 22:19:43 -0000 1.10
+++ array.c 27 Nov 2003 05:24:40 -0000 1.11
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: array.c,v 1.10 2003/11/26 22:19:43 mej Exp $";
+static const char cvs_ident[] = "$Id: array.c,v 1.11 2003/11/27 05:24:40 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/avl_tree.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- avl_tree.c 26 Nov 2003 22:19:44 -0000 1.4
+++ avl_tree.c 27 Nov 2003 05:24:41 -0000 1.5
@@ -23,7 +23,7 @@
static const char cvs_ident[] = "$Id: linked_list.c,v 1.10 2002/08/14 01:45:15 mej
Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/conf.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- conf.c 27 Nov 2003 02:08:06 -0000 1.13
+++ conf.c 27 Nov 2003 05:24:41 -0000 1.14
@@ -31,9 +31,9 @@
* @author Michael Jennings <[EMAIL PROTECTED]>
*/
-static const char cvs_ident[] = "$Id: conf.c,v 1.13 2003/11/27 02:08:06 mej Exp $";
+static const char cvs_ident[] = "$Id: conf.c,v 1.14 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -312,13 +312,13 @@
Command = (char *) MALLOC(CONFIG_BUFF);
strcpy(OutFile, "Eterm-exec-");
- fd = libast_temp_file(OutFile, sizeof(OutFile));
+ fd = spiftool_temp_file(OutFile, sizeof(OutFile));
if ((fd < 0) || fchmod(fd, (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))) {
- print_error("Unable to create unique temporary file for \"%s\" -- %s\n",
param, strerror(errno));
+ libast_print_error("Unable to create unique temporary file for \"%s\" --
%s\n", param, strerror(errno));
return ((char *) NULL);
}
if (strlen(param) + strlen(OutFile) + 8 > CONFIG_BUFF) {
- print_error("Parse error in file %s, line %lu: Cannot execute command, line
too long\n", file_peek_path(), file_peek_line());
+ libast_print_error("Parse error in file %s, line %lu: Cannot execute
command, line too long\n", file_peek_path(), file_peek_line());
return ((char *) NULL);
}
strcpy(Command, param);
@@ -337,10 +337,10 @@
remove(OutFile);
Output = condense_whitespace(Output);
} else {
- print_warning("Command at line %lu of file %s returned no output.\n",
file_peek_line(), file_peek_path());
+ libast_print_warning("Command at line %lu of file %s returned no
output.\n", file_peek_line(), file_peek_path());
}
} else {
- print_warning("Output file %s could not be created. (line %lu of file
%s)\n", NONULL(OutFile), file_peek_line(), file_peek_path());
+ libast_print_warning("Output file %s could not be created. (line %lu of file
%s)\n", NONULL(OutFile), file_peek_line(), file_peek_path());
}
FREE(Command);
@@ -354,7 +354,7 @@
unsigned short n;
if (!param || ((n = num_words(param)) > 2)) {
- print_error("Parse error in file %s, line %lu: Invalid syntax for %get().
Syntax is: %get(variable)\n", file_peek_path(),
+ libast_print_error("Parse error in file %s, line %lu: Invalid syntax for
%get(). Syntax is: %get(variable)\n", file_peek_path(),
file_peek_line());
return NULL;
}
@@ -386,7 +386,7 @@
char *var, *val;
if (!param || (num_words(param) != 2)) {
- print_error("Parse error in file %s, line %lu: Invalid syntax for %put().
Syntax is: %put(variable value)\n", file_peek_path(),
+ libast_print_error("Parse error in file %s, line %lu: Invalid syntax for
%put(). Syntax is: %put(variable value)\n", file_peek_path(),
file_peek_line());
return NULL;
}
@@ -409,7 +409,7 @@
char *dir, *buff;
if (!param || (num_words(param) != 1)) {
- print_error("Parse error in file %s, line %lu: Invalid syntax for
%dirscan(). Syntax is: %dirscan(directory)\n",
+ libast_print_error("Parse error in file %s, line %lu: Invalid syntax for
%dirscan(). Syntax is: %dirscan(directory)\n",
file_peek_path(), file_peek_line());
return NULL;
}
@@ -572,7 +572,7 @@
}
*(--tmp1) = 0;
if (l) {
- print_error("parse error in file %s, line %lu: Mismatched
parentheses\n", file_peek_path(), file_peek_line());
+ libast_print_error("parse error in file %s, line %lu:
Mismatched parentheses\n", file_peek_path(), file_peek_line());
return ((char *) NULL);
}
Command = spifconf_shell_expand(Command);
@@ -625,7 +625,7 @@
newbuff[j] = *pbuff;
}
#else
- print_warning("Backquote execution support not compiled in,
ignoring\n");
+ libast_print_warning("Backquote execution support not compiled in,
ignoring\n");
newbuff[j] = *pbuff;
#endif
break;
@@ -783,7 +783,7 @@
if (fp != NULL) {
fgets(buff, 256, fp);
if (strncasecmp(buff, test, strlen(test))) {
- print_warning("%s exists but does not contain the proper magic string
(<%s-%s>)\n", name, libast_program_name,
+ libast_print_warning("%s exists but does not contain the proper magic
string (<%s-%s>)\n", name, libast_program_name,
libast_program_version);
fclose(fp);
fp = NULL;
@@ -794,7 +794,7 @@
}
ver = version_compare(begin_ptr, libast_program_version);
if (SPIF_CMP_IS_GREATER(ver)) {
- print_warning("Config file is designed for a newer version of %s\n",
libast_program_name);
+ libast_print_warning("Config file is designed for a newer version of
%s\n", libast_program_name);
}
}
}
@@ -837,7 +837,7 @@
spifconf_shell_expand(buff);
path = get_word(2, buff + 1);
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(),
+ libast_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 {
file_push(fp, path, NULL, 1, 0);
@@ -851,7 +851,7 @@
SPIFCONF_PARSE_RET();
}
strcpy(fname, "Eterm-preproc-");
- fd = libast_temp_file(fname, PATH_MAX);
+ fd = spiftool_temp_file(fname, PATH_MAX);
outfile = STRDUP(fname);
snprintf(cmd, PATH_MAX, "%s < %s > %s", get_pword(2, buff),
file_peek_path(), fname);
system(cmd);
@@ -929,7 +929,7 @@
for (; fgets(buff, CONFIG_BUFF, file_peek_fp());) {
file_inc_line();
if (!strchr(buff, '\n')) {
- print_error("Parse error in file %s, line %lu: line too long\n",
file_peek_path(), file_peek_line());
+ libast_print_error("Parse error in file %s, line %lu: line too
long\n", file_peek_path(), file_peek_line());
for (; fgets(buff, CONFIG_BUFF, file_peek_fp()) && !strrchr(buff,
'\n'););
continue;
}
@@ -958,7 +958,7 @@
} 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(),
+ libast_print_error("Parse error in file %s, line %lu: Not allowed in
\"null\" context: \"%s\"\n", file_peek_path(), file_peek_line(),
buff);
return (state);
}
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/debug.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- debug.c 26 Nov 2003 22:19:44 -0000 1.10
+++ debug.c 27 Nov 2003 05:24:41 -0000 1.11
@@ -28,13 +28,13 @@
* This file contains all non-cpp-based debugging functionality.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.10 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.11 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: debug.c,v 1.10 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: debug.c,v 1.11 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/dlinked_list.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- dlinked_list.c 26 Nov 2003 22:19:44 -0000 1.12
+++ dlinked_list.c 27 Nov 2003 05:24:41 -0000 1.13
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.12 2003/11/26 22:19:44 mej
Exp $";
+static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.13 2003/11/27 05:24:41 mej
Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/file.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- file.c 26 Nov 2003 22:19:44 -0000 1.5
+++ file.c 27 Nov 2003 05:24:41 -0000 1.6
@@ -28,13 +28,13 @@
* This file contains file-related functions.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.5 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.6 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: file.c,v 1.5 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: file.c,v 1.6 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -61,7 +61,7 @@
* @return The file descriptor for the new temp file.
*/
int
-libast_temp_file(char *ftemplate, size_t len)
+spiftool_temp_file(char *ftemplate, size_t len)
{
char buff[256];
int fd;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/linked_list.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- linked_list.c 26 Nov 2003 22:19:44 -0000 1.15
+++ linked_list.c 27 Nov 2003 05:24:41 -0000 1.16
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: linked_list.c,v 1.15 2003/11/26 22:19:44 mej
Exp $";
+static const char cvs_ident[] = "$Id: linked_list.c,v 1.16 2003/11/27 05:24:41 mej
Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/mem.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- mem.c 27 Nov 2003 02:08:06 -0000 1.14
+++ mem.c 27 Nov 2003 05:24:41 -0000 1.15
@@ -28,13 +28,13 @@
* This file contains the memory management subsystem.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.14 $
- * $Date: 2003/11/27 02:08:06 $
+ * $Revision: 1.15 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: mem.c,v 1.14 2003/11/27 02:08:06 mej Exp $";
+static const char cvs_ident[] = "$Id: mem.c,v 1.15 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/msgs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- msgs.c 26 Nov 2003 22:19:44 -0000 1.6
+++ msgs.c 27 Nov 2003 05:24:41 -0000 1.7
@@ -29,13 +29,13 @@
* error messages to the end user.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.6 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.7 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: msgs.c,v 1.6 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: msgs.c,v 1.7 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -162,7 +162,7 @@
* @see libast_program_name
*/
void
-print_error(const char *fmt, ...)
+libast_print_error(const char *fmt, ...)
{
va_list arg_ptr;
@@ -188,7 +188,7 @@
* @see libast_program_name
*/
void
-print_warning(const char *fmt, ...)
+libast_print_warning(const char *fmt, ...)
{
va_list arg_ptr;
@@ -214,7 +214,7 @@
* @see libast_program_name
*/
void
-fatal_error(const char *fmt, ...)
+libast_fatal_error(const char *fmt, ...)
{
va_list arg_ptr;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/obj.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- obj.c 26 Nov 2003 22:19:44 -0000 1.20
+++ obj.c 27 Nov 2003 05:24:41 -0000 1.21
@@ -28,13 +28,13 @@
* This file contains the basic object class.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.20 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.21 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: obj.c,v 1.20 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: obj.c,v 1.21 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- options.c 26 Nov 2003 22:19:44 -0000 1.10
+++ options.c 27 Nov 2003 05:24:41 -0000 1.11
@@ -29,13 +29,13 @@
* option parser.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.10 $
- * $Date: 2003/11/26 22:19:44 $
+ * $Revision: 1.11 $
+ * $Date: 2003/11/27 05:24:41 $
*/
-static const char cvs_ident[] = "$Id: options.c,v 1.10 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: options.c,v 1.11 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -200,7 +200,7 @@
}
/* No matching long option found. Report an error and
continue with the next arg. */
- print_error("Unrecognized long option --%s\n", opt);
+ libast_print_error("Unrecognized long option --%s\n", opt);
CHECK_BAD();
return ((spif_int32_t) -1);
}
@@ -229,7 +229,7 @@
return j;
}
}
- print_error("unrecognized option -%c\n", opt);
+ libast_print_error("unrecognized option -%c\n", opt);
CHECK_BAD();
return ((spif_int32_t) -1);
}
@@ -592,7 +592,7 @@
}
spif_str_append_from_ptr(warn, SPIFOPT_OPT_LONG(j));
spif_str_append_from_ptr(warn, " option is deprecated and should not be
used.\n");
- print_warning(SPIF_STR_STR(warn));
+ libast_print_warning(SPIF_STR_STR(warn));
spif_str_del(warn);
}
@@ -600,7 +600,7 @@
if (SPIFOPT_OPT_NEEDS_VALUE(j)) {
if (val_ptr == NULL) {
if (islong) {
- print_error("long option --%s requires a%s value\n",
SPIFOPT_OPT_LONG(j),
+ libast_print_error("long option --%s requires a%s value\n",
SPIFOPT_OPT_LONG(j),
(SPIFOPT_OPT_IS_INTEGER(j)
? ("n integer")
: (SPIFOPT_OPT_IS_STRING(j)
@@ -609,7 +609,7 @@
? "n argument list"
: ""))));
} else {
- print_error("option -%c requires a%s value\n",
SPIFOPT_OPT_SHORT(j),
+ libast_print_error("option -%c requires a%s value\n",
SPIFOPT_OPT_SHORT(j),
(SPIFOPT_OPT_IS_INTEGER(j)
? ("n integer")
: (SPIFOPT_OPT_IS_STRING(j)
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/regexp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- regexp.c 26 Nov 2003 22:19:44 -0000 1.8
+++ regexp.c 27 Nov 2003 05:24:41 -0000 1.9
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: regexp.c,v 1.8 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: regexp.c,v 1.9 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -184,7 +184,7 @@
self->data = SPIF_CAST(ptr) pcre_compile(SPIF_STR_STR(SPIF_STR(self)),
self->flags, &errptr, &erroffset, NULL);
if (self->data == SPIF_NULL_TYPE(ptr)) {
- print_error("PCRE compilation of \"%s\" failed at offset %d -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), erroffset, errptr);
+ libast_print_error("PCRE compilation of \"%s\" failed at offset %d --
%s\n", SPIF_STR_STR(SPIF_STR(self)), erroffset, errptr);
return FALSE;
}
return TRUE;
@@ -197,7 +197,7 @@
self->data = SPIF_CAST(ptr) MALLOC(sizeof(regex_t));
if ((errcode = regcomp(SPIF_CAST_C(regex_t *) self->data,
SPIF_STR_STR(SPIF_STR(self)), (self->flags & 0xffff))) != 0) {
regerror(errcode, SPIF_CAST_C(regex_t *) self->data, buff, sizeof(buff));
- print_error("POSIX regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), buff);
+ libast_print_error("POSIX regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), buff);
FREE(self->data);
return FALSE;
}
@@ -223,7 +223,7 @@
} else if (rc == PCRE_ERROR_NOMATCH) {
return FALSE;
} else {
- print_error("PCRE matching error %d on \"%s\"\n", rc,
SPIF_STR_STR(subject));
+ libast_print_error("PCRE matching error %d on \"%s\"\n", rc,
SPIF_STR_STR(subject));
return FALSE;
}
}
@@ -240,7 +240,7 @@
return FALSE;
} else {
regerror(rc, SPIF_CAST_C(regex_t *) self->data, errbuf, sizeof(errbuf));
- print_error("POSIX regexp matching error on \"%s\" -- %s\n",
SPIF_STR_STR(subject), errbuf);
+ libast_print_error("POSIX regexp matching error on \"%s\" -- %s\n",
SPIF_STR_STR(subject), errbuf);
return FALSE;
}
}
@@ -250,7 +250,7 @@
err = SPIF_CAST(charptr) re_comp(SPIF_STR_STR(SPIF_STR(self)));
if (err != SPIF_NULL_TYPE(charptr)) {
- print_error("BSD regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), err);
+ libast_print_error("BSD regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), err);
return FALSE;
}
return ((re_exec(SPIF_STR_STR(subject)) == 0) ? (FALSE) : (TRUE));
@@ -272,7 +272,7 @@
} else if (rc == PCRE_ERROR_NOMATCH) {
return FALSE;
} else {
- print_error("PCRE matching error %d on \"%s\"\n", rc, subject);
+ libast_print_error("PCRE matching error %d on \"%s\"\n", rc, subject);
return FALSE;
}
}
@@ -289,7 +289,7 @@
return FALSE;
} else {
regerror(rc, SPIF_CAST_C(regex_t *) self->data, errbuf, sizeof(errbuf));
- print_error("POSIX regexp matching error on \"%s\" -- %s\n", subject,
errbuf);
+ libast_print_error("POSIX regexp matching error on \"%s\" -- %s\n",
subject, errbuf);
return FALSE;
}
}
@@ -299,7 +299,7 @@
err = SPIF_CAST(charptr) re_comp(SPIF_STR_STR(SPIF_STR(self)));
if (err != SPIF_NULL_TYPE(charptr)) {
- print_error("BSD regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), err);
+ libast_print_error("BSD regexp compilation of \"%s\" failed -- %s\n",
SPIF_STR_STR(SPIF_STR(self)), err);
return FALSE;
}
return ((re_exec(subject) == 0) ? (FALSE) : (TRUE));
@@ -346,7 +346,7 @@
case '$': self->flags |= (REG_NOTEOL << 8); break;
#endif
default:
- print_warning("Unrecognized regexp flag character \'%c\'\n", *p);
+ libast_print_warning("Unrecognized regexp flag character \'%c\'\n",
*p);
break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/snprintf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- snprintf.c 26 Nov 2003 22:19:44 -0000 1.3
+++ snprintf.c 27 Nov 2003 05:24:41 -0000 1.4
@@ -1,4 +1,4 @@
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -9,7 +9,7 @@
# undef HAVE_STDARG_H
#endif
-static const char cvs_ident[] = "$Id: snprintf.c,v 1.3 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: snprintf.c,v 1.4 2003/11/27 05:24:41 mej Exp $";
/*
* Shamelessly snarfed from Enlightenment...
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/socket.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- socket.c 26 Nov 2003 22:19:44 -0000 1.13
+++ socket.c 27 Nov 2003 05:24:41 -0000 1.14
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: socket.c,v 1.13 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: socket.c,v 1.14 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -286,7 +286,7 @@
self->fd = SPIF_CAST(sockfd) socket(self->fam, self->type, self->proto);
if (self->fd < 0) {
- print_error("Unable to create socket(%d, %d, %d) -- %s\n", (int)
self->fam,
+ libast_print_error("Unable to create socket(%d, %d, %d) -- %s\n", (int)
self->fam,
(int) self->type, (int) self->proto, strerror(errno));
return FALSE;
}
@@ -300,7 +300,7 @@
D_OBJ(("Binding to port %d\n", ntohs(addr->sin_port)));
if (bind(self->fd, SPIF_CAST(sockaddr) addr,
SPIF_SIZEOF_TYPE(ipsockaddr))) {
- print_error("Unable to bind socket %d to %s -- %s\n", (int)
self->fd,
+ libast_print_error("Unable to bind socket %d to %s -- %s\n",
(int) self->fd,
SPIF_STR_STR(self->local_url), strerror(errno));
FREE(addr);
return FALSE;
@@ -312,7 +312,7 @@
addr = spif_url_get_unixaddr(self->local_url);
if (bind(self->fd, SPIF_CAST(sockaddr) addr,
SPIF_SIZEOF_TYPE(unixsockaddr))) {
- print_error("Unable to bind socket %d to %s -- %s\n", (int)
self->fd,
+ libast_print_error("Unable to bind socket %d to %s -- %s\n",
(int) self->fd,
SPIF_STR_STR(self->local_url), strerror(errno));
FREE(addr);
return FALSE;
@@ -327,14 +327,14 @@
if (!SPIF_URL_ISNULL(self->remote_url)) {
spif_socket_clear_nbio(self);
if ((connect(self->fd, self->addr, self->len)) < 0) {
- print_error("Unable to connect socket %d to %s -- %s\n", (int) self->fd,
+ libast_print_error("Unable to connect socket %d to %s -- %s\n", (int)
self->fd,
SPIF_STR_STR(self->remote_url), strerror(errno));
return FALSE;
}
SPIF_SOCKET_FLAGS_SET(self, SPIF_SOCKET_FLAGS_CONNECTED);
} else if (!SPIF_URL_ISNULL(self->local_url)) {
if ((listen(self->fd, 5)) < 0) {
- print_error("Unable to listen at %s on socket %d -- %s\n",
+ libast_print_error("Unable to listen at %s on socket %d -- %s\n",
SPIF_STR_STR(self->local_url), (int) self->fd,
strerror(errno));
return FALSE;
}
@@ -355,7 +355,7 @@
ret = close(self->fd);
} while ((ret < 0) && (errno == EINTR));
if (ret < 0) {
- print_error("Unable to close socket %d -- %s\n", self->fd, strerror(errno));
+ libast_print_error("Unable to close socket %d -- %s\n", self->fd,
strerror(errno));
self->fd = -1;
return FALSE;
}
@@ -377,7 +377,7 @@
FD_ZERO(&write_fds);
FD_SET(self->fd, &write_fds);
if ((select(self->fd + 1, &read_fds, &write_fds, NULL, &tv)) < 0) {
- print_error("Unable to select() on %d -- %s\n", self->fd, strerror(errno));
+ libast_print_error("Unable to select() on %d -- %s\n", self->fd,
strerror(errno));
return FALSE;
}
@@ -410,7 +410,7 @@
} while ((newfd < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK)));
if (newfd < 0) {
- print_error("Unable to accept() connection on %d -- %s\n", self->fd,
strerror(errno));
+ libast_print_error("Unable to accept() connection on %d -- %s\n", self->fd,
strerror(errno));
return SPIF_NULL_TYPE(socket);
}
@@ -685,12 +685,12 @@
hinfo = gethostbyname(SPIF_STR_STR(hostname));
} while ((tries <= 3) && (hinfo == NULL) && (h_errno == TRY_AGAIN));
if (hinfo == NULL) {
- print_error("Unable to resolve hostname \"%s\" -- %s\n",
SPIF_STR_STR(hostname), hstrerror(h_errno));
+ libast_print_error("Unable to resolve hostname \"%s\" -- %s\n",
SPIF_STR_STR(hostname), hstrerror(h_errno));
return SPIF_NULL_TYPE(ipsockaddr);
}
if (hinfo->h_addr_list == NULL) {
- print_error("Invalid address list returned by gethostbyname()\n");
+ libast_print_error("Invalid address list returned by gethostbyname()\n");
return SPIF_NULL_TYPE(ipsockaddr);
}
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/str.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- str.c 26 Nov 2003 22:19:44 -0000 1.23
+++ str.c 27 Nov 2003 05:24:41 -0000 1.24
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: str.c,v 1.23 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: str.c,v 1.24 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/strings.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- strings.c 26 Nov 2003 22:19:44 -0000 1.12
+++ strings.c 27 Nov 2003 05:24:41 -0000 1.13
@@ -30,9 +30,9 @@
* @author Michael Jennings <[EMAIL PROTECTED]>
*/
-static const char cvs_ident[] = "$Id: strings.c,v 1.12 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: strings.c,v 1.13 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -168,7 +168,7 @@
if (pattern) {
if ((result = regcomp(rexp, pattern, REG_EXTENDED)) != 0) {
regerror(result, rexp, errbuf, 256);
- print_error("Unable to compile regexp %s -- %s.\n", pattern, errbuf);
+ libast_print_error("Unable to compile regexp %s -- %s.\n", pattern,
errbuf);
return (FALSE);
}
}
@@ -176,7 +176,7 @@
if (((result = regexec(rexp, str, (size_t) 0, (regmatch_t *) NULL, 0)) != 0)
&& (result != REG_NOMATCH)) {
regerror(result, rexp, errbuf, 256);
- print_error("Error testing input string %s -- %s.\n", str, errbuf);
+ libast_print_error("Error testing input string %s -- %s.\n", str, errbuf);
return (FALSE);
}
return ((result == REG_NOMATCH) ? (FALSE) : (TRUE));
@@ -196,7 +196,7 @@
if (pattern) {
if ((result = regcomp(*rexp, pattern, REG_EXTENDED)) != 0) {
regerror(result, *rexp, errbuf, 256);
- print_error("Unable to compile regexp %s -- %s.\n", pattern, errbuf);
+ libast_print_error("Unable to compile regexp %s -- %s.\n", pattern,
errbuf);
FREE(*rexp);
return (FALSE);
}
@@ -205,7 +205,7 @@
if (((result = regexec(*rexp, str, (size_t) 0, (regmatch_t *) NULL, 0))
!= 0) && (result != REG_NOMATCH)) {
regerror(result, *rexp, errbuf, 256);
- print_error("Error testing input string %s -- %s.\n", str, errbuf);
+ libast_print_error("Error testing input string %s -- %s.\n", str, errbuf);
return (FALSE);
}
return ((result == REG_NOMATCH) ? (FALSE) : (TRUE));
@@ -228,7 +228,7 @@
REQUIRE_RVAL(str != NULL, (char **) NULL);
if ((slist = (char **) MALLOC(sizeof(char *))) == NULL) {
- print_error("split(): Unable to allocate memory -- %s\n", strerror(errno));
+ libast_print_error("split(): Unable to allocate memory -- %s\n",
strerror(errno));
return ((char **) NULL);
}
@@ -241,7 +241,7 @@
/* First, resize the list to two bigger than our count. Why two?
One for the string we're about to do, and one for a trailing NULL. */
if ((slist = (char **) REALLOC(slist, sizeof(char *) * (cnt + 2))) == NULL) {
- print_error("split(): Unable to allocate memory -- %s\n",
strerror(errno));
+ libast_print_error("split(): Unable to allocate memory -- %s\n",
strerror(errno));
return ((char **) NULL);
}
@@ -249,7 +249,7 @@
of the string we have yet to parse, so allocate that much space to start.
*/
len = strlen(pstr) + 1;
if ((slist[cnt] = (char *) MALLOC(len)) == NULL) {
- print_error("split(): Unable to allocate memory -- %s.\n",
strerror(errno));
+ libast_print_error("split(): Unable to allocate memory -- %s.\n",
strerror(errno));
return ((char **) NULL);
}
pdest = slist[cnt];
@@ -345,7 +345,7 @@
k = strlen(str) + 1;
if ((tmpstr = (char *) MALLOC(k)) == NULL) {
- print_error("get_word(%lu, %s): Unable to allocate memory -- %s.\n", index,
str, strerror(errno));
+ libast_print_error("get_word(%lu, %s): Unable to allocate memory -- %s.\n",
index, str, strerror(errno));
return ((char *) NULL);
}
*tmpstr = 0;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/tok.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- tok.c 26 Nov 2003 22:19:44 -0000 1.16
+++ tok.c 27 Nov 2003 05:24:41 -0000 1.17
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: tok.c,v 1.16 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: tok.c,v 1.17 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/url.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- url.c 26 Nov 2003 22:19:44 -0000 1.12
+++ url.c 27 Nov 2003 05:24:41 -0000 1.13
@@ -21,9 +21,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: url.c,v 1.12 2003/11/26 22:19:44 mej Exp $";
+static const char cvs_ident[] = "$Id: url.c,v 1.13 2003/11/27 05:24:41 mej Exp $";
-#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-------------------------------------------------------
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
