Merge pull request #93 from encounter/fix/stage2-args

Fix stage2_args_t mismatch
This commit is contained in:
TuxSH authored and GitHub committed 2018-05-11 23:38:25 +02:00
commit 4ada3b6195
3 files changed
+2 -5

No files matched your search

+1 -1
View File
@@ -90,7 +90,7 @@ static void __program_parse_argc_argv(int argc, char *argdata) {
strcpy((char *)__program_argv[0], argdata);
pos += len + 1;
__program_argv[1] = malloc(len + 1);
__program_argv[1] = malloc(sizeof(stage2_args_t));
if (__program_argv[1] == NULL) {
generic_panic();
}
-3
View File
@@ -21,9 +21,6 @@ typedef struct {
typedef struct {
uint32_t version;
uint32_t *lfb;
uint32_t console_row;
uint32_t console_col;
char bct0[BCTO_MAX_SIZE];
} stage2_args_t;
+1 -1
View File
@@ -90,7 +90,7 @@ static void __program_parse_argc_argv(int argc, char *argdata) {
strcpy((char *)__program_argv[0], argdata);
pos += len + 1;
__program_argv[1] = malloc(len + 1);
__program_argv[1] = malloc(sizeof(stage2_args_t));
if (__program_argv[1] == NULL) {
generic_panic();
}