summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-03-10 21:20:05 +0000
committerChristian Persch <chpe@src.gnome.org>2005-03-10 21:20:05 +0000
commita2371d2592102948dade768636e7bb3d79b904ad (patch)
tree9ecbe10aa2bc7db2d3e1181ca44d3416977c8395
parent8bccb99bd934d2544778635ab967100bf441a968 (diff)
downloadyelp-a2371d2592102948dade768636e7bb3d79b904ad.tar.gz
Don't use C++ comments in C files. Fixes the build with --enable-debug.
2005-03-10 Christian Persch <chpe@cvs.gnome.org> * src/yelp-db-pager.c: (walker_walk_xml): * src/yelp-io-channel.c: * src/yelp-man-parser.c: (parser_escape_tags): * src/yelp-toc-pager.c: (toc_process_pending): * src/yelp-window.c: (window_populate), (window_do_load_pager), (pager_finish_cb): * src/yelp-xslt-pager.c: (xslt_yelp_cache): Don't use C++ comments in C files. Fixes the build with --enable-debug.
-rw-r--r--ChangeLog13
-rw-r--r--src/yelp-db-pager.c2
-rw-r--r--src/yelp-io-channel.c2
-rw-r--r--src/yelp-man-parser.c20
-rw-r--r--src/yelp-toc-pager.c2
-rw-r--r--src/yelp-window.c8
-rw-r--r--src/yelp-xslt-pager.c2
7 files changed, 31 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b586bd0..267e0f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2005-03-10 Christian Persch <chpe@cvs.gnome.org>
+ * src/yelp-db-pager.c: (walker_walk_xml):
+ * src/yelp-io-channel.c:
+ * src/yelp-man-parser.c: (parser_escape_tags):
+ * src/yelp-toc-pager.c: (toc_process_pending):
+ * src/yelp-window.c: (window_populate), (window_do_load_pager),
+ (pager_finish_cb):
+ * src/yelp-xslt-pager.c: (xslt_yelp_cache):
+
+ Don't use C++ comments in C files. Fixes the build with
+ --enable-debug.
+
+2005-03-10 Christian Persch <chpe@cvs.gnome.org>
+
* .cvsignore:
R INSTALL:
* autogen.sh:
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index da6de4c5..9870aaee 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -431,7 +431,7 @@ walker_walk_xml (DBWalker *walker)
while (gtk_events_pending ())
gtk_main_iteration ();
- // FIXME : check for cancel
+ /* FIXME : check for cancel */
old_cur = walker->cur;
walker->depth++;
diff --git a/src/yelp-io-channel.c b/src/yelp-io-channel.c
index bd5b2bd3..f93edbd0 100644
--- a/src/yelp-io-channel.c
+++ b/src/yelp-io-channel.c
@@ -150,7 +150,7 @@ yelp_io_close (GIOChannel *channel,
if (yelp_channel->gzin)
gzclose (yelp_channel->gzin);
- // FIXME: return error on error
+ /* FIXME: return error on error */
return G_IO_STATUS_NORMAL;
}
diff --git a/src/yelp-man-parser.c b/src/yelp-man-parser.c
index 94e899c5..556f8a83 100644
--- a/src/yelp-man-parser.c
+++ b/src/yelp-man-parser.c
@@ -62,18 +62,18 @@ static void parser_make_link (YelpManParser *parser);
typedef struct _StackElem StackElem;
struct _YelpManParser {
- xmlDocPtr doc; // The top-level XML document
- xmlNodePtr ins; // The insertion node
+ xmlDocPtr doc; /* The top-level XML document */
+ xmlNodePtr ins; /* The insertion node */
- GIOChannel *channel; // GIOChannel for the entire document
+ GIOChannel *channel; /* GIOChannel for the entire document */
- gchar *buffer; // The buffer, line at a time
- gint length; // The buffer length
+ gchar *buffer; /* The buffer, line at a time */
+ gint length; /* The buffer length */
- gchar *anc; // The anchor point in the document
- gchar *cur; // Our current position in the document
+ gchar *anc; /* The anchor point in the document */
+ gchar *cur; /* Our current position in the document */
- gboolean make_links; // Allow auto-generated hyperlinks to be disabled.
+ gboolean make_links; /* Allow auto-generated hyperlinks to be disabled. */
GSList *nodeStack;
};
@@ -580,7 +580,7 @@ parser_escape_tags (YelpManParser *parser,
xmlNodePtr cur = parser->ins;
GSList *path = NULL;
- // Find the top node we can escape from
+ /* Find the top node we can escape from */
while (cur->parent != (xmlNodePtr) parser->doc) {
for (i = 0; i < ntags; i++)
if (!xmlStrcmp (cur->name, BAD_CAST tags[i])) {
@@ -591,7 +591,7 @@ parser_escape_tags (YelpManParser *parser,
cur = cur->parent;
}
- // Walk back down, reproducing nodes we aren't escaping
+ /* Walk back down, reproducing nodes we aren't escaping */
if (node) {
GSList *c = path;
while (c && (xmlNodePtr) c->data != node)
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index de242e30..a7e4450c 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -365,7 +365,7 @@ toc_process_pending (YelpTocPager *pager)
static gint process_i = 0;
if (priv->cancel || !priv->pending_func) {
- // FIXME: clean stuff up.
+ /* FIXME: clean stuff up. */
return FALSE;
}
diff --git a/src/yelp-window.c b/src/yelp-window.c
index d03f5fb3..740873e2 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -920,7 +920,7 @@ window_populate (YelpWindow *window)
priv->pane = gtk_hpaned_new ();
gtk_widget_ref (priv->pane);
- // We should probably remember the last position and set to that.
+ /* We should probably remember the last position and set to that. */
gtk_paned_set_position (GTK_PANED (priv->pane), 180);
priv->side_sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1189,7 +1189,7 @@ window_do_load_pager (YelpWindow *window,
case YELP_PAGER_STATE_NEW:
case YELP_PAGER_STATE_INVALID:
startnow = TRUE;
- // no break
+ /* no break */
case YELP_PAGER_STATE_STARTED:
case YELP_PAGER_STATE_PARSING:
priv->start_handler =
@@ -1241,7 +1241,7 @@ window_do_load_pager (YelpWindow *window,
}
}
- // FIXME: error if !handled
+ /* FIXME: error if !handled */
}
done:
@@ -1672,7 +1672,7 @@ pager_finish_cb (YelpPager *pager,
window->priv->current_frag);
window_error (window, error, TRUE);
- // FIXME: Remove the URI from the history and go back
+ /* FIXME: Remove the URI from the history and go back */
}
/** Gecko Callbacks ***********************************************************/
diff --git a/src/yelp-xslt-pager.c b/src/yelp-xslt-pager.c
index 0254d0ac..858e7ca3 100644
--- a/src/yelp-xslt-pager.c
+++ b/src/yelp-xslt-pager.c
@@ -464,5 +464,5 @@ xslt_yelp_cache (xsltTransformContextPtr ctxt,
while (gtk_events_pending ())
gtk_main_iteration ();
- // FIXME : check for cancel
+ /* FIXME : check for cancel */
}