projects
/
wikiq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b685a77
)
parseData -> revisionData
author
Erik Garrison
<erik@hypervolu.me>
Thu, 7 Oct 2010 04:50:04 +0000
(
00:50
-0400)
committer
Erik Garrison
<erik@hypervolu.me>
Thu, 7 Oct 2010 04:50:04 +0000
(
00:50
-0400)
wikiq.c
patch
|
blob
|
history
diff --git
a/wikiq.c
b/wikiq.c
index 554e1459efa96f8e9e222564972954a58446a572..4f7aa4d6ca1c3a4825ae03db8325091ecc256d02 100644
(file)
--- a/
wikiq.c
+++ b/
wikiq.c
@@
-48,7
+48,7
@@
typedef struct {
enum block position;
enum outtype output_type;
enum block position;
enum outtype output_type;
-}
parse
Data;
+}
revision
Data;
/* free_data and clean_data
/* free_data and clean_data
@@
-57,7
+57,7
@@
typedef struct {
* Also, frees memory dynamically allocated to store data.
*/
static void
* Also, frees memory dynamically allocated to store data.
*/
static void
-clean_data(
parse
Data *data, int title)
+clean_data(
revision
Data *data, int title)
{
if (title) {
data->rev.title = NULL;
{
if (title) {
data->rev.title = NULL;
@@
-78,7
+78,7
@@
clean_data(parseData *data, int title)
}
static void
}
static void
-free_data(
parse
Data *data, int title)
+free_data(
revision
Data *data, int title)
{
if (title) {
//printf("freeing article\n");
{
if (title) {
//printf("freeing article\n");
@@
-97,19
+97,19
@@
free_data(parseData *data, int title)
free(data->rev.text);
}
free(data->rev.text);
}
-cleanup_revision(
parse
Data *data) {
+cleanup_revision(
revision
Data *data) {
free_data(data, 0);
clean_data(data, 0);
}
free_data(data, 0);
clean_data(data, 0);
}
-cleanup_article(
parse
Data *data) {
+cleanup_article(
revision
Data *data) {
free_data(data, 1);
clean_data(data, 1);
}
static void
free_data(data, 1);
clean_data(data, 1);
}
static void
-init_data(
parse
Data *data, char *dropstr, int output_type)
+init_data(
revision
Data *data, char *dropstr, int output_type)
{
clean_data(data, 1); // sets every element to null...
data->dropstr = dropstr;
{
clean_data(data, 1); // sets every element to null...
data->dropstr = dropstr;
@@
-119,7
+119,7
@@
init_data(parseData *data, char *dropstr, int output_type)
/* for debugging only, prints out the state of the data struct
*/
static void
/* for debugging only, prints out the state of the data struct
*/
static void
-print_state(
parse
Data *data)
+print_state(
revision
Data *data)
{
printf("element = %i\n", data->element);
printf("output_type = %i\n", data->output_type);
{
printf("element = %i\n", data->element);
printf("output_type = %i\n", data->output_type);
@@
-158,7
+158,7
@@
write_header()
* it is called right before cleanup_revision() and cleanup_article()
*/
static void
* it is called right before cleanup_revision() and cleanup_article()
*/
static void
-write_row(
parse
Data *data)
+write_row(
revision
Data *data)
{
// define temporary variables to hold output values:
char *title, *articleid;
{
// define temporary variables to hold output values:
char *title, *articleid;
@@
-281,7
+281,7
@@
char
}
void
}
void
-split_timestamp(
parse
Data *data)
+split_timestamp(
revision
Data *data)
{
char *t = data->rev.timestamp;
char date_buffer[DATE_LENGTH+1];
{
char *t = data->rev.timestamp;
char date_buffer[DATE_LENGTH+1];
@@
-327,7
+327,7
@@
contains(char *s, char *t)
}
static void
}
static void
-charhndl(
parse
Data *data, char *s, int len)
+charhndl(
revision
Data *data, char *s, int len)
{
if (data->element != UNUSED && data->position != SKIP) {
char t[len];
{
if (data->element != UNUSED && data->position != SKIP) {
char t[len];
@@
-384,7
+384,7
@@
charhndl(parseData *data, char *s, int len)
}
static void
}
static void
-start(
parse
Data *data, const char *name, const char **attr)
+start(
revision
Data *data, const char *name, const char **attr)
{
if (strcmp(name,"title") == 0) {
{
if (strcmp(name,"title") == 0) {
@@
-442,7
+442,7
@@
start(parseData *data, const char *name, const char **attr)
static void
static void
-end(
parse
Data *data, const char *name)
+end(
revision
Data *data, const char *name)
{
if (strcmp(name, "revision") == 0 && data->position != SKIP) {
write_row(data); // crucial... :)
{
if (strcmp(name, "revision") == 0 && data->position != SKIP) {
write_row(data); // crucial... :)
@@
-507,7
+507,7
@@
main(int argc, char *argv[])
XML_Parser parser = XML_ParserCreate(NULL);
// initialize the user data struct which is passed to callback functions
XML_Parser parser = XML_ParserCreate(NULL);
// initialize the user data struct which is passed to callback functions
-
parse
Data data;
+
revision
Data data;
// initialize the elements of the struct to default values
init_data(&data, dropstr, output_type);
// initialize the elements of the struct to default values
init_data(&data, dropstr, output_type);
Benjamin Mako Hill
||
Want to submit a patch?