From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Thu, 14 Feb 2008 11:31:00 +0000 (+0000)
Subject:   * Fixed Bug
X-Git-Tag: v0.12.20~869
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2e348712d1124a4ccbbc5fc4394070953bc1fe60;p=modchxj%2Fmod_chxj.git

  * Fixed Bug
    - when the image of non-correspondence is converted, and aborted.


git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_8_0@1849 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index 6614346f..104d04e7 100644
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -38,7 +38,7 @@
     ap_log_rerror(APLOG_MARK,APLOG_DEBUG, 0, r,"%s %s %d %s\n",__FILE__,(__func__),__LINE__,description); \
     description=(char *) MagickRelinquishMemory(description); \
     DestroyMagickWand(magick_wand); \
-  }while(1) 
+  } while(0) 
 
 typedef enum img_conv_mode_t {
   IMG_CONV_MODE_NORMAL = 0,
diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c
index 107b681b..d01b0f1f 100644
--- a/src/chxj_qr_code.c
+++ b/src/chxj_qr_code.c
@@ -37,12 +37,13 @@
 */
 #define EXIT_MAGICK_ERROR() \
           do { \
-             char *description; ExceptionType severity; \
+             char *description; \
+             ExceptionType severity; \
              description=MagickGetException(magick_wand,&severity); \
              ap_log_rerror(APLOG_MARK,APLOG_DEBUG, 0, r,"%s %s %d %s\n",__FILE__,(__func__),__LINE__,description); \
              description=(char *) MagickRelinquishMemory(description); \
              DestroyMagickWand(magick_wand); \
-          }while(1)
+          }while(0)
 
 /*----------------------------------------------------------------------------*/
 /* ¥â¡¼¥É»Ø¼¨»Ò¥Æ¡¼¥Ö¥ë                                                       */