37 lines
1.4 KiB
Plaintext
37 lines
1.4 KiB
Plaintext
$OpenBSD: patch-libyelp_yelp-man-parser_c,v 1.1 2011/09/12 07:28:55 jasper Exp $
|
|
|
|
From e6e1bfec226fd91decd4ef972637589f38dc5e4d Mon Sep 17 00:00:00 2001
|
|
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
|
Date: Tue, 14 Jun 2011 22:08:27 +0000
|
|
Subject: Don't use stdout as a variable name.
|
|
|
|
--- libyelp/yelp-man-parser.c.orig Wed May 11 12:48:23 2011
|
|
+++ libyelp/yelp-man-parser.c Wed May 11 12:48:35 2011
|
|
@@ -369,7 +369,7 @@ yelp_man_parser_new (void)
|
|
static GInputStream*
|
|
get_troff (gchar *path, GError **error)
|
|
{
|
|
- gint stdout;
|
|
+ gint ystdout;
|
|
GError *err = NULL;
|
|
gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", NULL, NULL };
|
|
|
|
@@ -377,7 +377,7 @@ get_troff (gchar *path, GError **error)
|
|
|
|
if (!g_spawn_async_with_pipes (NULL, argv, NULL,
|
|
G_SPAWN_SEARCH_PATH, NULL, NULL,
|
|
- NULL, NULL, &stdout, NULL, &err)) {
|
|
+ NULL, NULL, &ystdout, NULL, &err)) {
|
|
/* We failed to run the man program. Return a "Huh?" error. */
|
|
*error = g_error_new (YELP_ERROR, YELP_ERROR_UNKNOWN,
|
|
err->message);
|
|
@@ -385,7 +385,7 @@ get_troff (gchar *path, GError **error)
|
|
return NULL;
|
|
}
|
|
|
|
- return (GInputStream*) g_unix_input_stream_new (stdout, TRUE);
|
|
+ return (GInputStream*) g_unix_input_stream_new (ystdout, TRUE);
|
|
}
|
|
|
|
xmlDocPtr
|