Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-12 03:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused variables (detected with gcc-4.6)

Browse Source 
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2011-12-16 04:43:11 +01:00
parent 7b2824186b
commit 14f8dd5556
7 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libemile/emile_first_set_param_scsi_extents.c
View File

@ -20,7 +20,7 @@ int emile_first_set_param_scsi_extents( int fd, int drive_num, int second_offset
int ret; int ret;
char first[1024]; char first[1024];
int current; int current;
unsigned short max_blocks; /* unsigned short max_blocks; */
int location; int location;
location = lseek(fd, 0, SEEK_CUR); location = lseek(fd, 0, SEEK_CUR);
@ -31,7 +31,7 @@ int emile_first_set_param_scsi_extents( int fd, int drive_num, int second_offset
if (ret == -1) if (ret == -1)
return EEMILE_CANNOT_READ_FIRST; return EEMILE_CANNOT_READ_FIRST;
max_blocks = read_short((u_int16_t*)&first[1022]) / 6; /* max_blocks = read_short((u_int16_t*)&first[1022]) / 6; */
write_short((u_int16_t*)&first[1014], blocksize); write_short((u_int16_t*)&first[1014], blocksize);
write_short((u_int16_t*)&first[1016], drive_num); write_short((u_int16_t*)&first[1016], drive_num);

3
libemile/emile_second_set_configuration.c
View File

@ -20,7 +20,6 @@ int emile_second_set_configuration(int fd, int8_t *configuration)
int ret; int ret;
int size; int size;
int len; int len;
off_t offset;
char *buf; char *buf;
if (configuration == NULL) if (configuration == NULL)
@ -33,7 +32,7 @@ int emile_second_set_configuration(int fd, int8_t *configuration)
ret = read(fd, &header, sizeof(header)); ret = read(fd, &header, sizeof(header));
if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature))) if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature)))
{ {
offset = lseek(fd, FIRST_LEVEL_SIZE, SEEK_SET); lseek(fd, FIRST_LEVEL_SIZE, SEEK_SET);
ret = read(fd, &header, sizeof(header)); ret = read(fd, &header, sizeof(header));
if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature))) if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature)))
return EEMILE_INVALID_SECOND; return EEMILE_INVALID_SECOND;

8
libiso9660/iso9660_mount.c
View File

@ -80,7 +80,7 @@ void print_info(struct iso_primary_descriptor *ipd)
void iso9660_name(stream_VOLUME *volume, struct iso_directory_record *idr, char *buffer) void iso9660_name(stream_VOLUME *volume, struct iso_directory_record *idr, char *buffer)
{ {
int j; int j;
unsigned char uh, ul, uc; unsigned char /* uh, */ ul, uc;
buffer[0] = 0; buffer[0] = 0;
if (idr->name_len[0] == 1 && idr->name[0] == 0) if (idr->name_len[0] == 1 && idr->name[0] == 0)
@ -97,7 +97,7 @@ void iso9660_name(stream_VOLUME *volume, struct iso_directory_record *idr, char
*/ */
for (j = 0; j < (int)idr->name_len[0] / 2; j++) { for (j = 0; j < (int)idr->name_len[0] / 2; j++) {
uh = idr->name[j*2]; /* uh = idr->name[j*2]; */
ul = idr->name[j*2+1]; ul = idr->name[j*2+1];
/* /*
@ -140,14 +140,14 @@ stream_VOLUME *iso9660_mount(device_io_t *device)
iso9660_VOLUME* volume; iso9660_VOLUME* volume;
struct iso_primary_descriptor *jpd; struct iso_primary_descriptor *jpd;
struct iso_primary_descriptor ipd; struct iso_primary_descriptor ipd;
struct iso_directory_record * idr; /* struct iso_directory_record * idr; */
int block; int block;
int ucs_level; int ucs_level;
/* read filesystem descriptor */ /* read filesystem descriptor */
device->read_sector(device->data, 16, &ipd, sizeof (ipd)); device->read_sector(device->data, 16, &ipd, sizeof (ipd));
idr = (struct iso_directory_record *)ipd.root_directory_record; /* idr = (struct iso_directory_record *)ipd.root_directory_record; */
/* /*
* High sierra: * High sierra:

11
tools/emile-mkisofs.c
View File

@ -102,7 +102,6 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
int fd_driver; int fd_driver;
char *buffer; char *buffer;
unsigned char *driver; unsigned char *driver;
int ret;
struct stat st; struct stat st;
int driver_size; int driver_size;
@ -124,7 +123,7 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
fprintf(stderr, "Cannot malloc %d bytes\n", driver_size); fprintf(stderr, "Cannot malloc %d bytes\n", driver_size);
return -1; return -1;
} }
ret = read(fd_driver, driver, st.st_size); read(fd_driver, driver, st.st_size);
close(fd_driver); close(fd_driver);
@ -187,11 +186,11 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
mkstemp(temp); mkstemp(temp);
fd = fopen(temp, "w"); fd = fopen(temp, "w");
ret = fwrite(&block0, 1, sizeof(block0), fd); fwrite(&block0, 1, sizeof(block0), fd);
ret = fwrite(&map2048, 1, sizeof(map2048), fd); fwrite(&map2048, 1, sizeof(map2048), fd);
ret = fwrite(&map512, 1, sizeof(map512), fd); fwrite(&map512, 1, sizeof(map512), fd);
memset(&map512, 0, sizeof(map512)); memset(&map512, 0, sizeof(map512));
ret = fwrite(&map512, 1, sizeof(map512), fd); fwrite(&map512, 1, sizeof(map512), fd);
fwrite(driver, driver_size, 1, fd); fwrite(driver, driver_size, 1, fd);
free(driver); free(driver);

3
tools/emile-set-cmdline.c
View File

@ -76,7 +76,6 @@ static int set_cmdline(char* image, char *kernel, char* cmdline, char *ramdisk)
int get_cmdline(char* image) int get_cmdline(char* image)
{ {
int fd; int fd;
int ret;
char kernel[255]; char kernel[255];
char cmdline[255]; char cmdline[255];
char ramdisk[255]; char ramdisk[255];
@ -88,7 +87,7 @@ int get_cmdline(char* image)
return 2; return 2;
} }
ret = emile_second_get_param(fd, kernel, cmdline, ramdisk); emile_second_get_param(fd, kernel, cmdline, ramdisk);
if (kernel[0]) if (kernel[0])
printf("kernel path: \"%s\"\n", kernel); printf("kernel path: \"%s\"\n", kernel);

6
tools/gzio.c
View File

@ -98,8 +98,10 @@ local gzFile gz_open (path, mode, fd)
int fd; int fd;
{ {
int err; int err;
#ifndef NO_GZCOMPRESS
int level = Z_DEFAULT_COMPRESSION; /* compression level */ int level = Z_DEFAULT_COMPRESSION; /* compression level */
int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
#endif
char *p = (char*)mode; char *p = (char*)mode;
gz_stream *s; gz_stream *s;
char fmode[80]; /* copy of mode, without the compression level */ char fmode[80]; /* copy of mode, without the compression level */
@ -136,6 +138,7 @@ local gzFile gz_open (path, mode, fd)
do { do {
if (*p == 'r') s->mode = 'r'; if (*p == 'r') s->mode = 'r';
if (*p == 'w' || *p == 'a') s->mode = 'w'; if (*p == 'w' || *p == 'a') s->mode = 'w';
#ifndef NO_GZCOMPRESS
if (*p >= '0' && *p <= '9') { if (*p >= '0' && *p <= '9') {
level = *p - '0'; level = *p - '0';
} else if (*p == 'f') { } else if (*p == 'f') {
@ -145,6 +148,9 @@ local gzFile gz_open (path, mode, fd)
} else if (*p == 'R') { } else if (*p == 'R') {
strategy = Z_RLE; strategy = Z_RLE;
} else { } else {
#else
if (1) {
#endif
*m++ = *p; /* copy the mode */ *m++ = *p; /* copy the mode */
} }
} while (*p++ && m != fmode + sizeof(fmode)); } while (*p++ && m != fmode + sizeof(fmode));

14
tools/read_vmlinuz.c
View File

@ -16,13 +16,12 @@ int main(int argc, char **argv)
gzFile in; gzFile in;
Elf32_Ehdr elf_header; Elf32_Ehdr elf_header;
Elf32_Phdr *program_header; Elf32_Phdr *program_header;
int ret;
unsigned long min_addr, max_addr, kernel_size; unsigned long min_addr, max_addr, kernel_size;
int i; int i;
char * base; char * base;
in = gzopen("vmlinux.gz", "rb"); in = gzopen("vmlinux.gz", "rb");
ret = gzread(in, &elf_header, sizeof(Elf32_Ehdr)); gzread(in, &elf_header, sizeof(Elf32_Ehdr));
if (elf_header.e_machine != EM_68K) if (elf_header.e_machine != EM_68K)
{ {
@ -44,9 +43,9 @@ int main(int argc, char **argv)
return 3; return 3;
} }
ret = gzseek(in, elf_header.e_phoff, SEEK_SET); gzseek(in, elf_header.e_phoff, SEEK_SET);
ret = gzread(in, program_header, elf_header.e_phnum * sizeof(Elf32_Phdr)); gzread(in, program_header, elf_header.e_phnum * sizeof(Elf32_Phdr));
min_addr = 0xffffffff; min_addr = 0xffffffff;
max_addr = 0; max_addr = 0;
for (i = 0; i < elf_header.e_phnum; i++) for (i = 0; i < elf_header.e_phnum; i++)
@ -78,12 +77,13 @@ int main(int argc, char **argv)
i, (long)program_header[i].p_offset, i, (long)program_header[i].p_offset,
program_header[i].p_vaddr - PAGE_SIZE, program_header[i].p_vaddr - PAGE_SIZE,
(long)program_header[i].p_filesz); (long)program_header[i].p_filesz);
ret = gzseek(in, program_header[i].p_offset, SEEK_SET); gzseek(in, program_header[i].p_offset, SEEK_SET);
ret = gzread(in, base + program_header[i].p_vaddr - PAGE_SIZE, program_header[i].p_filesz); gzread(in, base + program_header[i].p_vaddr - PAGE_SIZE,
program_header[i].p_filesz);
} }
write(STDOUT_FILENO, base, kernel_size); write(STDOUT_FILENO, base, kernel_size);
ret = gzclose(in); gzclose(in);
return 0; return 0;
} }