Update of /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28623
Modified Files:
main.c shred_helper.c
Log Message:
-- Declare errno via errno.h.
-- Alignment: replace <prefix> by PREFIX in usage message.
Index: shred_helper.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred/shred_helper.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- shred_helper.c 8 Jan 2008 10:00:07 -0000 1.11
+++ shred_helper.c 9 Jan 2008 17:24:44 -0000 1.12
@@ -25,17 +25,17 @@
* $Id$
*/
-#include "pf_config.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <assert.h>
+#include <errno.h>
+
+#include "pf_config.h"
#include "shred_helper.h"
#include "oops.h"
-extern int errno;
-
#ifndef HAVE_STRDUP
/**
* Alternative definition of strdup. It just duplicates a string
Index: main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- main.c 8 Jan 2008 10:00:07 -0000 1.7
+++ main.c 9 Jan 2008 17:24:44 -0000 1.8
@@ -36,9 +36,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <errno.h>
-extern int errno;
-
/* alternative definitions for strdup and strndup
* and some helper functions
*/
@@ -151,7 +150,7 @@
printf (" -f filename%s: encode given input XML document\n",
long_option (opt_buf, ", --%s=filename", 'f'));
- printf (" -o prefix%s: writes encoding to file <prefix>.csv\n",
+ printf (" -o prefix%s: writes encoding to file PREFIX.csv\n",
long_option (opt_buf, ", --%s=prefix", 'o'));
printf (" -F format%s: format selected encoding components\n"
"\t(default: '%s')\n"
@@ -168,13 +167,13 @@
"\t%%u: element/attribute namespace URI\n"
"\t%%t: text node content\n"
"\t%%d: text node content stored as number (if possible)\n"
- "\t%%g: guide node for node (also writes dataguide to file
<prefix>_guide.xml)\n",
+ "\t%%g: guide node for node (also writes dataguide to file
PREFIX_guide.xml)\n",
long_option (opt_buf, ", --%s=format", 'F'), SQL_FORMAT);
printf (" -a%s: attributes separate (default: attributes inline)\n"
- "\twrites attribute encoding to file <prefix>_atts.csv\n",
+ "\twrites attribute encoding to file PREFIX_atts.csv\n",
long_option (opt_buf, ", --%s", 'a'));
printf (" -n%s: element/attribute names inline (default: names
separate)\n"
- "\twrites localname/URI encoding to files
<prefix>_names.csv/<prefix>_uris.csv\n",
+ "\twrites localname/URI encoding to files
PREFIX_names.csv/PREFIX_uris.csv\n",
long_option (opt_buf, ", --%s", 'n'));
printf (" -h%s: print this help message\n",
long_option (opt_buf, ", --%s", 'h'));
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
