gEDA-cvs: branch: master updated (1.1.2.20070818-166-gf1d4aeb)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  f1d4aeb308de9b805ff0b21d7e94b09bc01dc569 (commit)
      from  b10a0ed7e99910a5d83565ede63a7ff9b11bc528 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 libgeda/src/f_print.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)


=================
 Commit Messages
=================

commit f1d4aeb308de9b805ff0b21d7e94b09bc01dc569
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sat Dec 22 21:01:35 2007 +0000

    libgeda: Use goto to tidy some error handling in f_print.c

:100644 100644 19d62f6... ddca066... M	libgeda/src/f_print.c

=========
 Changes
=========

commit f1d4aeb308de9b805ff0b21d7e94b09bc01dc569
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sat Dec 22 21:01:35 2007 +0000

    libgeda: Use goto to tidy some error handling in f_print.c

diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index 19d62f6..ddca066 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -87,7 +87,7 @@ void f_print_set_color(FILE *fp, int color)
 int f_print_header(TOPLEVEL *toplevel, FILE *fp,
 		   int paper_size_x, int paper_size_y, int eps) 
 {
-  char *buf;
+  char *buf = NULL;
   FILE *prolog;
   size_t bytes;
   int llx,lly,urx,ury;
@@ -133,20 +133,16 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
   
   /* Allocate a buffer to use during copy */
 #define PROLOG_BUFFER_SIZE 8192
+
+  /* Don't check this (succeeds or aborts) */
   buf = g_malloc(PROLOG_BUFFER_SIZE);
-  if(buf == NULL) {
-    s_log_message("Unable to allocate %d bytes in f_print_header()\n"
-		  "Giving up on printing.\n",PROLOG_BUFFER_SIZE);
-    return -1;
-  }
+
   /* Open the prolog file */
   prolog = fopen(toplevel->postscript_prolog,"r");
   if(prolog == NULL) {
     s_log_message("Unable to open the prolog file `%s' for reading "
-		  "in f_print_header()\n"
-		  "Giving up on printing\n", toplevel->postscript_prolog);
-    g_free(buf);  /* If we got to here, the buffer was allocated. */
-    return -1;
+		  "in f_print_header()\n", toplevel->postscript_prolog);
+    goto f_print_header_fail;
   }
   /* Loop while reading file into buffer and dump it
    * back out to the supplied file handle
@@ -159,29 +155,27 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
 
   if(ferror(prolog)) {
     s_log_message("Error during reading of the prolog file `%s' "
-		  "in f_print_header()\n"
-		  "Giving up on printing\n", toplevel->postscript_prolog);
-    g_free(buf);  /* If we got to here, the buffer was allocated. */
-    return -1;
+		  "in f_print_header()\n", toplevel->postscript_prolog);
+    goto f_print_header_fail;
   }
 
   if(ferror(fp)) {
     s_log_message("Error during writing of the output postscript file "
-		  "in f_print_header()\n"
-		  "Giving up on printing\n");
-    g_free(buf);  /* If we got to here, the buffer was allocated. */
-    return -1;
+		  "in f_print_header()\n");
+    goto f_print_header_fail;
   }
   g_free(buf);  /* If we got to here, the buffer was allocated. */
 
   fprintf(fp,"%%%%EndProlog\n"
 	  "%%%%Page: 1 1\n");     /* Just name it `page 1' for now */
   
-  /* These go after the prolog ends because they affect the graphics
-   * state
-   */
 
   return 0;
+
+ f_print_header_fail:
+  s_log_message ("Giving up on printing\n");
+  g_free (buf); /* g_free() succeeds if argument is NULL */
+  return -1;
 }
 
 /*! \brief Prints the footer to a postscript document




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs