Don't use == to test IO conditions

2001-06-18  Bradford Hovinen  <hovinen@ximian.com>

	* config-log.c (slave_data_cb): Don't use == to test IO conditions
This commit is contained in:
Bradford Hovinen 2001-06-18 16:45:31 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent c7af228de9
commit aa7315ed93
3 changed files with 21 additions and 3 deletions

View file

@ -1,3 +1,7 @@
2001-06-18 Bradford Hovinen <hovinen@ximian.com>
* config-log.c (slave_data_cb): Don't use == to test IO conditions
2001-06-01 Bradford Hovinen <hovinen@ximian.com> 2001-06-01 Bradford Hovinen <hovinen@ximian.com>
* location.c (run_backend_proc): Don't free path string after * location.c (run_backend_proc): Don't free path string after

View file

@ -1334,11 +1334,13 @@ slave_data_cb (GIOChannel *channel, GIOCondition condition,
g_return_val_if_fail (slave->config_log != NULL, FALSE); g_return_val_if_fail (slave->config_log != NULL, FALSE);
g_return_val_if_fail (IS_CONFIG_LOG (slave->config_log), FALSE); g_return_val_if_fail (IS_CONFIG_LOG (slave->config_log), FALSE);
if (condition == G_IO_HUP || slave->buffer->closed) { DEBUG_MSG ("Condition is %d", condition);
if (condition & G_IO_HUP || slave->buffer->closed) {
slave_destroy (slave); slave_destroy (slave);
return FALSE; return FALSE;
} }
else if (condition == G_IO_IN) { else if (condition & G_IO_IN) {
if (load_log_entry (slave->config_log, TRUE, slave->buffer, if (load_log_entry (slave->config_log, TRUE, slave->buffer,
NULL) != NULL) NULL) != NULL)
slave_broadcast_data (slave, slave->config_log); slave_broadcast_data (slave, slave->config_log);

View file

@ -411,7 +411,19 @@ location_do_rollback (Location *location, gchar *backend_id, xmlDocPtr doc)
output = fdopen (fd, "w"); output = fdopen (fd, "w");
xmlDocDump (output, doc); xmlDocDump (output, doc);
fclose (output);
DEBUG_MSG ("Done dumping data; flushing and closing output stream");
if (fflush (output) == EOF) {
g_critical ("%s: Could not dump buffer: %s",
__FUNCTION__, g_strerror (errno));
}
if (fclose (output) == EOF) {
g_critical ("%s: Could not close output stream: %s",
__FUNCTION__, g_strerror (errno));
return FALSE;
}
return TRUE; return TRUE;
} }