Skip to content

Commit d187cf6

Browse files
fix warnings
1 parent aa06a3f commit d187cf6

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

filesystem/kernel/kernel.sys

0 Bytes
Binary file not shown.

filesystem/src/terminal/program.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ void main(int argc, char ** argv) {
3939
free((void *)app_argv);
4040
continue;
4141
}
42+
i = 0;
4243
app_argv = mystrsplit(input, ' ');
43-
44+
while(app_argv[i]) free((void *)(app_argv[i++]));
45+
free((void *)app_argv);
4446
if(!strcmp(app_argv[0], "cls")) screen_clear();
4547
else if(!strcmp(app_argv[0], "exit")) _exit();
4648
else if(!strcmp(app_argv[0], "yield")) task_yield();
@@ -52,7 +54,6 @@ void main(int argc, char ** argv) {
5254

5355
void setupelf(char * input) {
5456
char ** app_argv;
55-
// puts(input + strlen("setupelf")+1);
5657
app_argv = mystrsplit(input + strlen("setupelf")+1, ' ');
5758
if(!path_exists(app_argv[0])) {
5859
execve(app_argv[0], strptrlen(app_argv), app_argv, 0);

src/kernel/task.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ void print_task_linked_list() {
148148
void dump_all_task_memory_usage() {
149149
puts("Loaded tasks: \n");
150150
task_t * ptr = runningTask;
151-
page_directory_pointer_table_entry_t * pdpt, *pdpt_bk;
151+
page_directory_pointer_table_entry_t * pdpt;
152152
page_directory_table_entry_t * pdir;
153153
page_table_entry_t * ptab;
154154
int i, j, k;
155155
disablePagingAsm();
156156
do {
157157
pdpt = (page_directory_pointer_table_entry_t *)ptr->regs.cr3;
158-
puts(&ptr->name);
158+
puts((char *)&ptr->name);
159159
putc('[');
160160
screen_print_int(ptr->pid, 10);
161161
puts("]: ");
@@ -189,14 +189,15 @@ void dump_all_task_memory_usage() {
189189

190190
void disp_heap(unsigned int pid) {
191191
task_t * ptr = runningTask;
192-
memory_block_header_t * heap_ptr = 0x700000;
192+
memory_block_header_t * heap_ptr = (memory_block_header_t *)0x700000;
193193
unsigned int pdpt_bk, i;
194194
do {
195195
ptr = ptr->next;
196196
}
197197
while((ptr->pid != pid) && (ptr != runningTask));
198198
pdpt_bk = swapPageDirectoryAsm((unsigned int *)ptr->regs.cr3);
199199
if(!heap_ptr->used) return;
200+
unsigned char c;
200201
do {
201202
set_screen_bgfg(0x70);
202203
puts("Length: ");
@@ -207,12 +208,15 @@ void disp_heap(unsigned int pid) {
207208
set_screen_bgfg(0x07);
208209
for(i = 0; i < heap_ptr->length; i++){
209210
set_screen_bgfg(0x07);
210-
screen_print_int(*((char *)(heap_ptr + i++)), 16);
211+
c = *((unsigned char *)((unsigned int)heap_ptr + sizeof(memory_block_header_t) + i));
212+
screen_print_int(c, 16);
213+
i++;
211214
set_screen_bgfg(0x0F);
212-
screen_print_int(*((char *)(heap_ptr + i)), 16);
215+
c = *((unsigned char *)((unsigned int)heap_ptr + sizeof(memory_block_header_t) + i));
216+
screen_print_int(c, 16);
213217
}
214218
heap_ptr = heap_ptr->next;
215219
} while(heap_ptr->length > 0);
216-
swapPageDirectoryAsm(pdpt_bk);
220+
swapPageDirectoryAsm((unsigned int *)pdpt_bk);
217221
set_screen_bgfg(0x07);
218222
}

0 commit comments

Comments
 (0)