diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-08-07 11:21:31 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-08-07 11:21:31 -0400 |
| commit | 90e87a110c648cb93c2bde0ace9626d5ce58167a (patch) | |
| tree | 41444f768a3248e0863d122f52edf12f89def0bf /src/ck-job.c | |
| parent | 488520e5c0d7d3684f7c91f11da52e9ef08d42c9 (diff) | |
don't use stderr or stdout as variable names
Diffstat (limited to 'src/ck-job.c')
| -rw-r--r-- | src/ck-job.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ck-job.c b/src/ck-job.c index 1093629..53aaba4 100644 --- a/src/ck-job.c +++ b/src/ck-job.c @@ -44,8 +44,8 @@ struct CkJobPrivate guint out_watch_id; char *command; - GString *stdout; - GString *stderr; + GString *std_out; + GString *std_err; GPid child_pid; }; @@ -138,7 +138,7 @@ error_watch (GIOChannel *source, switch (status) { case G_IO_STATUS_NORMAL: g_debug ("command error output: %s", line); - g_string_append (job->priv->stderr, line); + g_string_append (job->priv->std_err, line); break; case G_IO_STATUS_EOF: finished = TRUE; @@ -183,7 +183,7 @@ out_watch (GIOChannel *source, switch (status) { case G_IO_STATUS_NORMAL: g_debug ("command output: %s", line); - g_string_append (job->priv->stdout, line); + g_string_append (job->priv->std_out, line); break; case G_IO_STATUS_EOF: finished = TRUE; @@ -281,10 +281,10 @@ ck_job_execute (CkJob *job, gboolean ck_job_get_stdout (CkJob *job, - char **stdout) + char **std_outp) { - if (stdout != NULL) { - *stdout = g_strdup (job->priv->stdout->str); + if (std_outp != NULL) { + *std_outp = g_strdup (job->priv->std_out->str); } return TRUE; } @@ -335,8 +335,8 @@ ck_job_init (CkJob *job) { job->priv = CK_JOB_GET_PRIVATE (job); - job->priv->stderr = g_string_new (NULL); - job->priv->stdout = g_string_new (NULL); + job->priv->std_err = g_string_new (NULL); + job->priv->std_out = g_string_new (NULL); } gboolean @@ -374,8 +374,8 @@ ck_job_finalize (GObject *object) g_source_remove (job->priv->err_watch_id); } g_free (job->priv->command); - g_string_free (job->priv->stdout, TRUE); - g_string_free (job->priv->stderr, TRUE); + g_string_free (job->priv->std_out, TRUE); + g_string_free (job->priv->std_err, TRUE); G_OBJECT_CLASS (ck_job_parent_class)->finalize (object); } |