From 4c81b329ef504cb9b002757eac9f4bdf4efcc791 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 30 Sep 2010 07:42:32 +0000 Subject: [PATCH] Switched from old libjte API names to new ones --- xorriso/lib_mgt.c | 20 ++++++++++---------- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c index cfae4873..9fd63a2e 100644 --- a/xorriso/lib_mgt.c +++ b/xorriso/lib_mgt.c @@ -536,8 +536,8 @@ int Xorriso_assert_jte_handle(struct XorrisO *xorriso, int flag) ret= libjte_new(&(xorriso->libjte_handle), 0); if(ret <= 0 || xorriso->libjte_handle == NULL) return(0); - } - return(1); + } + return(1); } #endif /* Xorriso_with_libjtE */ @@ -573,35 +573,35 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg, goto bad_arg; } else if(strcmp(aspect, "template_path") == 0 || strcmp(aspect, "-jigdo-template") == 0) { - ret= libjte_set_template_out(jte, arg); + ret= libjte_set_template_path(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "jigdo_path") == 0 || strcmp(aspect, "-jigdo-jigdo") == 0) { - ret= libjte_set_jjigdo_out(jte, arg); + ret= libjte_set_jigdo_path(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "md5_path") == 0 || strcmp(aspect, "-md5-list") == 0) { - ret= libjte_set_jmd5_list(jte, arg); + ret= libjte_set_md5_path(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "min_size") == 0 || strcmp(aspect, "-jigdo-min-file-size") == 0) { num= Scanf_io_size(arg, 0); - ret= libjte_set_jte_min_size(jte, num); + ret= libjte_set_min_size(jte, num); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "checksum_iso") == 0) { - ret= libjte_set_checksum_algo_iso(jte, arg); + ret= libjte_set_checksum_iso(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "checksum_template") == 0) { - ret= libjte_set_checksum_algo_tmpl(jte, arg); + ret= libjte_set_checksum_template(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "compression") == 0) { - ret= libjte_set_jte_template_compression(jte, arg); + ret= libjte_set_compression(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "exclude") == 0 || @@ -611,7 +611,7 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg, goto jte_failed; } else if(strcmp(aspect, "demand_md5") == 0 || strcmp(aspect, "-jigdo-force-md5") == 0) { - ret= libjte_add_include(jte, arg); + ret= libjte_add_md5_demand(jte, arg); if(ret <= 0) goto jte_failed; } else if(strcmp(aspect, "mapping") == 0 || diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index ba10a2bb..936f13ac 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.09.29.164121" +#define Xorriso_timestamP "2010.09.30.074208"