libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made two non-public parameters independent of Xorriso_with_libjtE

Browse Source
This commit is contained in:
Thomas Schmitt 2010-10-01 19:02:57 +00:00
parent 4d58994100
commit 03f6935e35
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libisoburn/trunk/xorriso/base_obj.c
View File

@ -223,10 +223,10 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
m->libjte_handle= NULL; m->libjte_handle= NULL;
m->jigdo_params= NULL;
m->jigdo_values= NULL;
#endif #endif
m->jigdo_params= NULL;
m->jigdo_values= NULL;
m->loaded_boot_bin_lba= 0; m->loaded_boot_bin_lba= 0;
m->loaded_boot_cat_path[0]= 0; m->loaded_boot_cat_path[0]= 0;
m->allow_graft_points= 0; m->allow_graft_points= 0;
@ -432,10 +432,10 @@ int Xorriso_destroy(struct XorrisO **xorriso, int flag)
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
if(m->libjte_handle) if(m->libjte_handle)
libjte_destroy(&(m->libjte_handle)); libjte_destroy(&(m->libjte_handle));
Xorriso_lst_destroy_all(&(m->jigdo_params), 0);
Xorriso_lst_destroy_all(&(m->jigdo_values), 0);
#endif #endif
Xorriso_lst_destroy_all(&(m->jigdo_params), 0);
Xorriso_lst_destroy_all(&(m->jigdo_values), 0);
Xorriso_detach_libraries(m, flag&1); Xorriso_detach_libraries(m, flag&1);
free((char *) m); free((char *) m);

2
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -329,12 +329,12 @@ struct XorrisO { /* the global context of xorriso */
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
/* Parameters and state of Jigdo Template Export environment */ /* Parameters and state of Jigdo Template Export environment */
struct libjte_env *libjte_handle; struct libjte_env *libjte_handle;
#endif
/* List of -jigdo parameters since the most recent -jigdo clear */ /* List of -jigdo parameters since the most recent -jigdo clear */
struct Xorriso_lsT *jigdo_params; struct Xorriso_lsT *jigdo_params;
struct Xorriso_lsT *jigdo_values; struct Xorriso_lsT *jigdo_values;
#endif
/* LBA of boot image after image loading */ /* LBA of boot image after image loading */
int loaded_boot_bin_lba; int loaded_boot_bin_lba;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.09.30.074208" #define Xorriso_timestamP "2010.10.01.190235"