wok diff linld/stuff/src/TAZBOOT.CPP @ rev 20528

linld: pascal convention calls
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Nov 09 16:37:55 2018 +0100 (2018-11-09)
parents 049ced0bd387
children af959ebf1305
line diff
     1.1 --- a/linld/stuff/src/TAZBOOT.CPP	Fri Oct 26 10:09:53 2018 +0200
     1.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Fri Nov 09 16:37:55 2018 +0100
     1.3 @@ -129,7 +129,7 @@
     1.4  		if (isoopen(initrdfilename) >= 0) {
     1.5  			addinitrd();
     1.6  		}
     1.7 -		if (*init && isolseek(&initrddesc) != -1) {
     1.8 +		if (*init && isolseek(&initrddesc) != 0) {
     1.9  			read(x->fd, &x->filemod, 10); // + x->fileofs & x->filesize
    1.10  			magic = x->filemod;
    1.11  			x->fileofs &= 0xFFFFL;
    1.12 @@ -143,7 +143,7 @@
    1.13  		strcatb(buf_cmdline,"mode=");
    1.14  		strcat(buf_cmdline,mode);
    1.15  		strcatb(buf_cmdline,"magic=");
    1.16 -		strcat(buf_cmdline,ultoa(magic));
    1.17 +		strcat(buf_cmdline,(char *)ultoa(magic));
    1.18  	}
    1.19  	load_initrds();
    1.20  	if (isknoppix) {
    1.21 @@ -157,13 +157,15 @@
    1.22  	boot_kernel();
    1.23  }
    1.24  
    1.25 -u16 root_dev;
    1.26 -u16 vid_mode;
    1.27 +u32 root_dev;
    1.28 +u32 vid_mode;
    1.29 +u32 topmem;
    1.30  const char* kernel_name = "bzImage";
    1.31  const char* initrd_name;
    1.32 +char* iso;
    1.33 +
    1.34  int main(int argc, char *argv[])
    1.35  {
    1.36 -	char *iso = NULL;
    1.37  	argv[0] = progname();
    1.38  	bootiso(argv);	// iso ? parsing is /init.exe stuff !
    1.39