From 3d57d19a908c5a2195793f1a67d8284854a12ce1 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 2 May 2011 19:18:45 +0000
Subject: [PATCH] Better reporting of memory shortage with rev 3747

---
 xorriso/cmp_update.c        | 28 ++++++++--------------------
 xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/xorriso/cmp_update.c b/xorriso/cmp_update.c
index 4730ba21..95448689 100644
--- a/xorriso/cmp_update.c
+++ b/xorriso/cmp_update.c
@@ -312,12 +312,8 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
  int partno, total_parts= 0;
  off_t offset, bytes, total_bytes;
 
- a= TSOB_FELD(char, 5*SfileadrL);
- if(a == NULL)
-   {ret= -1; goto ex;}
- part_path= TSOB_FELD(char, SfileadrL);
- if(part_path == NULL)
-   {ret= -1; goto ex;}
+ Xorriso_alloc_meM(a, char, 5*SfileadrL);
+ Xorriso_alloc_meM(part_path, char, SfileadrL);
  
  *result= 0;
  respt= xorriso->result_line;
@@ -663,10 +659,8 @@ ex:;
    free(a2_acl);
  if(d2_acl != NULL)
    free(d2_acl);
- if(part_path != NULL)
-   free(part_path);
- if(a != NULL)
-   free(a);
+ Xorriso_free_meM(part_path);
+ Xorriso_free_meM(a);
  return(ret);
 }
 
@@ -678,9 +672,7 @@ int Xorriso_pfx_disk_path(struct XorrisO *xorriso, char *iso_path,
  int ret;
  char *adrc= NULL;
 
- adrc= TSOB_FELD(char, SfileadrL);
- if(adrc == NULL)
-   {ret= -1; goto ex;}
+ Xorriso_alloc_meM(adrc, char, SfileadrL);
 
  if(strncmp(iso_path, iso_prefix, strlen(iso_prefix))!=0)
    {ret= -1; goto ex;}
@@ -695,8 +687,7 @@ int Xorriso_pfx_disk_path(struct XorrisO *xorriso, char *iso_path,
    goto ex;
  ret= 1;
 ex:;
- if(adrc != NULL)
-   free(adrc);
+ Xorriso_free_meM(adrc);
  return(ret);
 }
 
@@ -716,9 +707,7 @@ int Xorriso_find_compare(struct XorrisO *xorriso, void *boss_iter, void *node,
  int ret, result, uret, follow_links, deleted= 0;
  char *disk_path= NULL;
 
- disk_path= TSOB_FELD(char, SfileadrL);
- if(disk_path == NULL)
-   {ret= -1; goto ex;}
+ Xorriso_alloc_meM(disk_path, char, SfileadrL);
 
  ret= Xorriso_pfx_disk_path(xorriso, iso_path, iso_prefix, disk_prefix,
                             disk_path, 0);
@@ -764,8 +753,7 @@ int Xorriso_find_compare(struct XorrisO *xorriso, void *boss_iter, void *node,
  if(result&(1<<17))
    {ret= 3; goto ex;}
 ex:;
- if(disk_path != NULL)
-   free(disk_path);
+ Xorriso_free_meM(disk_path);
  return(ret);
 }
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b4738edf..6b79a17f 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.02.191704"
+#define Xorriso_timestamP "2011.05.02.191905"