Imported Upstream version 3.1.0

[debian/amanda] / common-src / queueing.c

diff --git a/common-src/queueing.c b/common-src/queueing.c
index 672d844c299b2795ff5bfba8e178b927cc2a1dff..ac098a38cfa74dd0ece6b609557a23e4a5f9c60e 100644 (file)
--- a/common-src/queueing.c
+++ b/common-src/queueing.c
@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2005 Zmanda, Inc.  All Rights Reserved.
- * 
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 2.1 as 
- * published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful, but
+ * Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA.
- * 
- * Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
- * Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+ * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
 #include "queueing.h"
@@ -517,7 +517,11 @@ ssize_t fd_write_consumer(gpointer f_queue_fd, queue_buffer_t *buffer) {
                 continue;
         } else {
             /* Error occured. */
-            g_fprintf(stderr, "Error writing fd %d: %s\n", fd, strerror(errno));
+           int save_errno = errno;
+           amfree(queue_fd->errmsg);
+           queue_fd->errmsg = g_strdup_printf("Error writing fd %d: %s", fd,
+                                              strerror(save_errno));
+           dbprintf("%s\n", queue_fd->errmsg);
             return -1;
         }        
     }