|
|
improve wording and small typos - sfeed - RSS and Atom parser |
|
|
 |
git clone git://git.codemadness.org/sfeed (git://git.codemadness.org) |
|
|
 |
Log |
|
|
 |
Files |
|
|
 |
Refs |
|
|
 |
README |
|
|
 |
LICENSE |
|
|
|
--- |
|
|
 |
commit 21a263cb27aeaf02b4a0a0319f435fac92f1ea28 |
|
|
 |
parent ea04ae0101ae0607295ebea0a23364d31d1d37aa |
|
|
 |
Author: Hiltjo Posthuma <hiltjo@codemadness.org> (mailto://) |
application/vnd.lotus-organizer |
|
|
Date: Tue, 15 Aug 2023 19:10:51 +0200 |
|
|
|
|
|
|
|
improve wording and small typos |
|
|
|
|
|
|
|
Diffstat: |
|
|
|
M sfeed.c | 6 +++--- |
|
|
|
M sfeed_curses.c | 2 +- |
|
|
|
M sfeed_opml_import.c | 2 +- |
|
|
|
M sfeed_web.c | 2 +- |
|
|
|
M sfeed_xmlenc.c | 2 +- |
|
|
|
M xml.c | 4 ++-- |
|
|
|
M xml.h | 2 +- |
|
|
|
|
|
|
|
7 files changed, 10 insertions(+), 10 deletions(-) |
|
|
|
--- |
|
|
 |
diff --git a/sfeed.c b/sfeed.c |
|
|
|
@@ -724,8 +724,8 @@ xmlattr(XMLParser *p, const char *t, size_t tl, const char *n, size_t nl, |
|
|
|
if (!ctx.tag.id) |
|
|
|
return; |
|
|
|
|
|
|
|
- /* content-type may be: Atom: text, xhtml, html or mime-type. |
|
|
|
- MRSS (media:description): plain, html. */ |
|
|
|
+ /* content-type may be for Atom: text, xhtml, html or a mime-type. |
|
|
|
+ for MRSS (media:description): plain, html. */ |
|
|
|
if (ISCONTENTTAG(ctx)) { |
|
|
|
if (isattr(n, nl, STRP("type"))) |
|
|
|
string_append(&attrtype, v, vl); |
|
|
|
@@ -1073,7 +1073,7 @@ main(int argc, char *argv[]) |
|
|
|
parser.xmltagstart = xmltagstart; |
|
|
|
parser.xmltagstartparsed = xmltagstartparsed; |
|
|
|
|
|
|
|
- /* NOTE: getnext is defined in xml.h for inline optimization */ |
|
|
|
+ /* NOTE: GETNEXT is defined in xml.h for inline optimization */ |
|
|
|
xml_parse(&parser); |
|
|
|
|
|
|
|
checkfileerror(stdin, "<stdin>", 'r'); |
|
|
 |
diff --git a/sfeed_curses.c b/sfeed_curses.c |
|
|
|
@@ -1875,7 +1875,7 @@ markread(struct pane *p, off_t from, off_t to, int isread) |
|
|
|
_exit(status); |
|
|
|
default: |
|
|
|
/* waitpid() and block on process status change, |
|
|
|
- fail if exit statuscode was unavailable or non-zero */ |
|
|
|
+ fail if the exit status code was unavailable or non-zero */ |
|
|
|
if (waitpid(pid, &status, 0) <= 0 || status) |
|
|
|
break; |
|
|
|
|
|
|
 |
diff --git a/sfeed_opml_import.c b/sfeed_opml_import.c |
|
|
|
@@ -96,7 +96,7 @@ main(void) |
|
|
|
"# list of feeds to fetch:\n" |
|
|
|
"feeds() {\n" |
|
|
|
" # feed <name> <feedurl> [basesiteurl] [encoding]\n", stdout); |
|
|
|
- /* NOTE: getnext is defined in xml.h for inline optimization */ |
|
|
|
+ /* NOTE: GETNEXT is defined in xml.h for inline optimization */ |
|
|
|
xml_parse(&parser); |
|
|
|
fputs("}\n", stdout); |
|
|
|
|
|
|
 |
diff --git a/sfeed_web.c b/sfeed_web.c |
|
|
|
@@ -132,7 +132,7 @@ main(int argc, char *argv[]) |
|
|
|
parser.xmltagstart = xmltagstart; |
|
|
|
parser.xmltagstartparsed = xmltagstartparsed; |
|
|
|
|
|
|
|
- /* NOTE: getnext is defined in xml.h for inline optimization */ |
|
|
|
+ /* NOTE: GETNEXT is defined in xml.h for inline optimization */ |
|
|
|
xml_parse(&parser); |
|
|
|
|
|
|
|
checkfileerror(stdin, "<stdin>", 'r'); |
|
|
 |
diff --git a/sfeed_xmlenc.c b/sfeed_xmlenc.c |
|
|
|
@@ -52,7 +52,7 @@ main(void) |
|
|
|
parser.xmlattrend = xmlattrend; |
|
|
|
parser.xmltagstart = xmltagstart; |
|
|
|
|
|
|
|
- /* NOTE: getnext is defined in xml.h for inline optimization */ |
|
|
|
+ /* NOTE: GETNEXT is defined in xml.h for inline optimization */ |
|
|
|
xml_parse(&parser); |
|
|
|
|
|
|
|
checkfileerror(stdin, "<stdin>", 'r'); |
|
|
 |
diff --git a/xml.c b/xml.c |
|
|
|
@@ -317,7 +317,7 @@ xml_parse(XMLParser *x) |
|
|
|
x->taglen = 1; |
|
|
|
x->isshorttag = isend = 0; |
|
|
|
|
|
|
|
- /* treat processing instruction as shorttag, don't strip "?" prefix. */ |
|
|
|
+ /* treat processing instruction as short tag, don't strip "?" prefix. */ |
|
|
|
if (c == '?') { |
|
|
|
x->isshorttag = 1; |
|
|
|
} else if (c == '/') { |
|
|
|
@@ -346,7 +346,7 @@ xml_parse(XMLParser *x) |
|
|
|
if (x->xmltagstartparsed) |
|
|
|
x->xmltagstartparsed(x, x->tag, x->taglen, x->isshorttag); |
|
|
|
} |
|
|
|
- /* call tagend for shortform or processing instruction */ |
|
|
|
+ /* call tagend for short tag or processing instruction */ |
|
|
|
if (x->isshorttag) { |
|
|
|
if (x->xmltagend) |
|
|
|
x->xmltagend(x, x->tag, x->taglen, x->isshorttag); |
|
|
 |
diff --git a/xml.h b/xml.h |
|
|
|
@@ -30,7 +30,7 @@ typedef struct xmlparser { |
|
|
|
/* current tag */ |
|
|
|
char tag[1024]; |
|
|
|
size_t taglen; |
|
|
|
- /* current tag is in shortform ? <tag /> */ |
|
|
|
+ /* current tag is a short tag ? <tag /> */ |
|
|
|
int isshorttag; |
|
|
|
/* current attribute name */ |
|
|
|
char name[1024]; |
|