Attachment #822 for bug #1111

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1111
Collapse All | Expand All

Lines 32-38 Link Here

(-)k3b/libk3b/tools/k3biso9660.cpp (-1 / +1 lines)
32		32
33		33
34	/* callback function for libisofs */	34	/* callback function for libisofs */
35	int K3bIso9660::read_callback( char* buf, sector_t start, int len, void* udata )	35	int K3bIso9660::read_callback( char* buf, sector_t start, long long len, void* udata )
36	{	36	{
37	K3bIso9660* isoF = static_cast<K3bIso9660*>(udata);	37	K3bIso9660* isoF = static_cast<K3bIso9660*>(udata);
38		38

Lines 38-44 Link Here

(-)k3b/libk3b/tools/k3biso9660.h (-2 / +2 lines)
38	struct el_torito_boot_descriptor;	38	struct el_torito_boot_descriptor;
39	struct iso_primary_descriptor;	39	struct iso_primary_descriptor;
40		40
41	typedef long sector_t;	41	typedef long long sector_t;
42		42
43		43
44		44
Lines 437-443 Link Here
437	int m_joliet;	437	int m_joliet;
438		438
439	// only used for creation	439	// only used for creation
440	static int read_callback( char* buf, sector_t start, int len, void* udata );	440	static int read_callback( char* buf, sector_t start, long long len, void* udata );
441	static int isofs_callback( struct iso_directory_record* idr, void *udata );	441	static int isofs_callback( struct iso_directory_record* idr, void *udata );
442	K3bIso9660Directory *dirent;	442	K3bIso9660Directory *dirent;
443	bool m_rr;	443	bool m_rr;

Lines 121-127 Link Here

(-)k3b/libk3b/tools/libisofs/isofs.cpp (-1 / +1 lines)
121	boot->defentry=NULL;	121	boot->defentry=NULL;
122	}	122	}
123		123
124	int BootImageSize(readfunc* read,int media,sector_t start,int len,void* udata) {	124	int BootImageSize(readfunc* read,int media,sector_t start,long long len,void* udata) {
125	int ret;	125	int ret;
126		126
127	switch(media & 0xf) {	127	switch(media & 0xf) {




#include "iso_fs.h"
#include "el_torito.h"

typedef long long sector_t;

typedef struct _rr_entry {
	int		len;	/* length of structure */

	int		re; /* relocated */
	char	z_algo[2]; /* zizofs algorithm */
	char	z_params[2]; /* zizofs parameters */
	long long		z_size; /* zizofs real_size */
} rr_entry;

typedef struct _iso_vol_desc {

/**
 * this callback function needs to read 'len' sectors from 'start' into 'buf' 
 */
typedef int readfunc(char *buf,sector_t start, long long len,void *);

/**
 * ProcessDir uses this callback

/**
 * Returns the size of the boot image (in 512 byte sectors)
 */
int BootImageSize(readfunc *read,int media,sector_t start,long long len,void *udata);

/**
 * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,

Return to bug 1111

Lines 23-29 Link Here

(-)k3b/libk3b/tools/libisofs/isofs.h (-4 / +4 lines)
23	#include "iso_fs.h"	23	#include "iso_fs.h"
24	#include "el_torito.h"	24	#include "el_torito.h"
25		25
26	typedef long sector_t;	26	typedef long long sector_t;
27		27
28	typedef struct _rr_entry {	28	typedef struct _rr_entry {
29	int len; /* length of structure */	29	int len; /* length of structure */
Lines 48-54 Link Here
48	int re; /* relocated */	48	int re; /* relocated */
49	char z_algo[2]; /* zizofs algorithm */	49	char z_algo[2]; /* zizofs algorithm */
50	char z_params[2]; /* zizofs parameters */	50	char z_params[2]; /* zizofs parameters */
51	int z_size; /* zizofs real_size */	51	long long z_size; /* zizofs real_size */
52	} rr_entry;	52	} rr_entry;
53		53
54	typedef struct _iso_vol_desc {	54	typedef struct _iso_vol_desc {
Lines 74-80 Link Here
74	/**	74	/**
75	* this callback function needs to read 'len' sectors from 'start' into 'buf'	75	* this callback function needs to read 'len' sectors from 'start' into 'buf'
76	*/	76	*/
77	typedef int readfunc(char buf,sector_t start, int len,void );	77	typedef int readfunc(char buf,sector_t start, long long len,void );
78		78
79	/**	79	/**
80	* ProcessDir uses this callback	80	* ProcessDir uses this callback
Lines 135-141 Link Here
135	/**	135	/**
136	* Returns the size of the boot image (in 512 byte sectors)	136	* Returns the size of the boot image (in 512 byte sectors)
137	*/	137	*/
138	int BootImageSize(readfunc read,int media,sector_t start,int len,void udata);	138	int BootImageSize(readfunc read,int media,sector_t start,long long len,void udata);
139		139
140	/**	140	/**
141	* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,	141	* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,