imported patch dicache-cleanup6

3 files changed, 11 insertions, 10 deletions

diff --git a/src/dicache.c b/src/dicache.c
index 9a34544e..21173c9a 100644
--- a/src/dicache.c
+++ b/src/dicache.c
@@ -314,7 +314,7 @@ void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
 {
    DICacheEntry *DicEntry;
 
-   MSG("a_Dicache_set_parms (%s)\n", URL_STR(url));
+   _MSG("a_Dicache_set_parms (%s)\n", URL_STR(url));
    dReturn_if_fail ( Image != NULL && width && height );
    /* Find the DicEntry for this Image */
    DicEntry = a_Dicache_get_entry(url, version);
@@ -322,7 +322,7 @@ void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
    /* Parameters already set? */
    dReturn_if_fail ( DicEntry->State < DIC_SetParms );
 
-   MSG("  RefCount=%d version=%d\n", DicEntry->RefCount, DicEntry->version);
+   _MSG("  RefCount=%d version=%d\n", DicEntry->RefCount, DicEntry->version);
 
    /* BUG: there's just one image-type now */
    #define I_RGB 0
@@ -347,6 +347,7 @@ void a_Dicache_set_cmap(DilloUrl *url, int version, DilloImage *Image,
 {
    DICacheEntry *DicEntry = a_Dicache_get_entry(url, version);
 
+   _MSG("a_Dicache_set_cmap\n");
    dReturn_if_fail ( DicEntry != NULL );
 
    dFree(DicEntry->cmap);
@@ -368,7 +369,7 @@ void a_Dicache_new_scan(const DilloUrl *url, int version)
 {
    DICacheEntry *DicEntry;
 
-   MSG("a_Dicache_new_scan\n");
+   _MSG("a_Dicache_new_scan\n");
    dReturn_if_fail ( url != NULL );
    DicEntry = a_Dicache_get_entry(url, version);
    dReturn_if_fail ( DicEntry != NULL );
@@ -415,7 +416,7 @@ void a_Dicache_close(DilloUrl *url, int version, CacheClient_t *Client)
    DICacheEntry *DicEntry = a_Dicache_get_entry(url, version);
 
    dReturn_if_fail ( DicEntry != NULL );
-   MSG("a_Dicache_close RefCount=%d\n", DicEntry->RefCount);
+   _MSG("a_Dicache_close RefCount=%d\n", DicEntry->RefCount);
 
    DicEntry->State = DIC_Close;
    dFree(DicEntry->cmap);
diff --git a/src/html.cc b/src/html.cc
index 6454d6df..284e1a6a 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1600,7 +1600,7 @@ static void Html_tag_open_head(DilloHtml *html, const char *tag, int tagsize)
 static void Html_tag_close_head(DilloHtml *html, int TagIdx)
 {
    if (html->InFlags & IN_HEAD) {
-      MSG("Closing HEAD section\n");
+      _MSG("Closing HEAD section\n");
       if (html->Num_TITLE == 0)
          BUG_MSG("HEAD section lacks the TITLE element\n");
 
@@ -3025,7 +3025,7 @@ static void Html_tag_open_link(DilloHtml *html, const char *tag, int tagsize)
       return;
 
    MSG("  Html_tag_open_link(): URL=%s\n", URL_STR(url));
-   MSG("    repush after HEAD=%d\n", html->repush_after_head);
+   _MSG("    repush after HEAD=%d\n", html->repush_after_head);
 
    Html_load_stylesheet(html, url);
    a_Url_free(url);
diff --git a/src/image.cc b/src/image.cc
index cc41bc7c..0edaf35c 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -91,7 +91,7 @@ void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
                        int version, uint_t width, uint_t height,
                        DilloImgType type)
 {
-   MSG("a_Image_set_parms: width=%d height=%d\n", width, height);
+   _MSG("a_Image_set_parms: width=%d height=%d\n", width, height);
 
    bool resize = (Image->width != width || Image->height != height);
    OI(Image)->setBuffer((Imgbuf*)v_imgbuf, resize);
@@ -109,7 +109,7 @@ void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
  */
 void a_Image_set_cmap(DilloImage *Image, const uchar_t *cmap)
 {
-   MSG("a_Image_set_cmap\n");
+   _MSG("a_Image_set_cmap\n");
    Image->cmap = cmap;
    Image->State = IMG_SetCmap;
 }
@@ -119,7 +119,7 @@ void a_Image_set_cmap(DilloImage *Image, const uchar_t *cmap)
  */
 void a_Image_new_scan(DilloImage *Image, void *v_imgbuf)
 {
-   MSG("a_Image_new_scan\n");
+   _MSG("a_Image_new_scan\n");
    a_Bitvec_clear(Image->BitVec);
    Image->ScanNumber++;
    ((Imgbuf*)v_imgbuf)->newScan();
@@ -144,7 +144,7 @@ void a_Image_write(DilloImage *Image, uint_t y)
  */
 void a_Image_close(DilloImage *Image)
 {
-   MSG("a_Image_close\n");
+   _MSG("a_Image_close\n");
    a_Image_unref(Image);
 }