You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2005/10/07 07:24:20 UTC
svn commit: r307022 - in
/webservices/axis2/trunk/c/modules/xml/guththila/src: guththila_main.c
guththila_reader.c guththila_reader.h guththila_xml_pull_parser.c
guththila_xml_pull_parser.h
Author: samisa
Date: Thu Oct 6 22:24:07 2005
New Revision: 307022
URL: http://svn.apache.org/viewcvs?rev=307022&view=rev
Log:
Did naming related changed to READER
Modified:
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_main.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.h
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.h
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_main.c?rev=307022&r1=307021&r2=307022&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_main.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_main.c Thu Oct 6 22:24:07 2005
@@ -21,9 +21,9 @@
int main (int argc, char *argv[])
{
- READER *red;
+ guththila_reader_t *red;
FILE *fp = fopen ("response.xml", "r");
- red = Reader_createReader (fp);
+ red = guththila_reader_create (fp);
XML_PullParser *parser = XML_PullParser_createPullParser (red);
XML_PullParser_read (parser);
int c;
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.c?rev=307022&r1=307021&r2=307022&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.c Thu Oct 6 22:24:07 2005
@@ -21,10 +21,10 @@
#include "guththila_reader.h"
-READER *
-Reader_createReader (FILE *fp)
+guththila_reader_t *
+guththila_reader_create (FILE *fp)
{
- READER *reader = (READER *) malloc (sizeof(READER));
+ guththila_reader_t *reader = (guththila_reader_t *) malloc (sizeof(guththila_reader_t));
if (fp)
reader->fp = fp;
return reader;
@@ -32,7 +32,7 @@
void
-Reader_freeReader (READER *r)
+guththila_reader_free (guththila_reader_t *r)
{
if (r)
free (r);
@@ -40,14 +40,14 @@
int
-Reader_read (char *buffer, int offset, int length, READER *r)
+guththila_reader_read (char *buffer, int offset, int length, guththila_reader_t *r)
{
return (int)fread (buffer+offset, 1, length, r->fp);
}
int
-Reader_setInputStream (READER *r, FILE *fp)
+guththila_reader_set_input_stream (guththila_reader_t *r, FILE *fp)
{
if (fp)
{
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.h?rev=307022&r1=307021&r2=307022&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_reader.h Thu Oct 6 22:24:07 2005
@@ -18,22 +18,21 @@
*/
-#ifndef READER_H
-#define READER_H
+#ifndef GUTHTHILA_READER_H
+#define GUTHTHILA_READER_H
+
#include <stdio.h>
#include <stdlib.h>
#include "guththila_buffer.h"
-struct reader;
-typedef struct reader READER;
-struct reader
+typedef struct guththila_reader_s
{
FILE *fp;
-};
+} guththila_reader_t;
-READER *Reader_createReader (FILE *fp);
-int Reader_read (char *buffer, int offset, int length, READER *r);
-int Reader_setInputStream (READER *r, FILE *fp);
-void Reader_freeReader (READER *r);
+guththila_reader_t *guththila_reader_create (FILE *fp);
+int guththila_reader_read (char *buffer, int offset, int length, guththila_reader_t *r);
+int guththila_reader_set_input_stream (guththila_reader_t *r, FILE *fp);
+void guththila_reader_free (guththila_reader_t *r);
-#endif /* READER_H */
+#endif /* GUTHTHILA_READER_H */
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c?rev=307022&r1=307021&r2=307022&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.c Thu Oct 6 22:24:07 2005
@@ -20,7 +20,7 @@
#include "guththila_xml_pull_parser.h"
XML_PullParser *
-XML_PullParser_createPullParser (READER * r)
+XML_PullParser_createPullParser (guththila_reader_t * r)
{
XML_PullParser *parser =
(XML_PullParser *) malloc (sizeof (XML_PullParser));
@@ -116,7 +116,7 @@
}
}
c =
- Reader_read ((parser->buffer->buff), (parser->_next),
+ guththila_reader_read ((parser->buffer->buff), (parser->_next),
(parser->buffer->size) - (parser->_next), parser->reader);
parser->last += c;
return !c;
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.h?rev=307022&r1=307021&r2=307022&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_pull_parser.h Thu Oct 6 22:24:07 2005
@@ -66,7 +66,7 @@
typedef struct xmlpullpaser
{
guththila_buffer_t *buffer;
- READER *reader;
+ guththila_reader_t *reader;
guththila_token_t *prefix;
guththila_token_t *name;
guththila_token_t *value;
@@ -120,7 +120,7 @@
int XML_PullParser_is_valid_starting_char (XML_PullParser * p, int c);
int XML_PullParser_next (XML_PullParser * p);
-XML_PullParser *XML_PullParser_createPullParser (READER * r);
+XML_PullParser *XML_PullParser_createPullParser (guththila_reader_t * r);
void XML_PullParser_freePullParser ();
int XML_PullParser_getAttributeCount (XML_PullParser * p);
char *XML_PullParser_getAttributeName (XML_PullParser * p, guththila_attribute_t * att);