Merge pull request #964 from nvt/coffee-code-style
Fix some code style issues in Coffee.
This commit is contained in:
commit
f504b4dd17
1 changed files with 153 additions and 154 deletions
|
@ -212,10 +212,10 @@ static struct protected_mem_t {
|
||||||
coffee_page_t next_free;
|
coffee_page_t next_free;
|
||||||
char gc_wait;
|
char gc_wait;
|
||||||
} protected_mem;
|
} protected_mem;
|
||||||
static struct file * const coffee_files = protected_mem.coffee_files;
|
static struct file *const coffee_files = protected_mem.coffee_files;
|
||||||
static struct file_desc * const coffee_fd_set = protected_mem.coffee_fd_set;
|
static struct file_desc *const coffee_fd_set = protected_mem.coffee_fd_set;
|
||||||
static coffee_page_t * const next_free = &protected_mem.next_free;
|
static coffee_page_t *const next_free = &protected_mem.next_free;
|
||||||
static char * const gc_wait = &protected_mem.gc_wait;
|
static char *const gc_wait = &protected_mem.gc_wait;
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
|
@ -359,7 +359,6 @@ isolate_pages(coffee_page_t start, coffee_page_t skip_pages)
|
||||||
}
|
}
|
||||||
PRINTF("Coffee: Isolated %u pages starting in sector %d\n",
|
PRINTF("Coffee: Isolated %u pages starting in sector %d\n",
|
||||||
(unsigned)skip_pages, (int)start / COFFEE_PAGES_PER_SECTOR);
|
(unsigned)skip_pages, (int)start / COFFEE_PAGES_PER_SECTOR);
|
||||||
|
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
|
@ -1179,7 +1178,7 @@ cfs_write(int fd, const void *buf, unsigned size)
|
||||||
PRINTF("Extended the file at page %u\n", (unsigned)file->page);
|
PRINTF("Extended the file at page %u\n", (unsigned)file->page);
|
||||||
}
|
}
|
||||||
#if COFFEE_IO_SEMANTICS
|
#if COFFEE_IO_SEMANTICS
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if COFFEE_MICRO_LOGS
|
#if COFFEE_MICRO_LOGS
|
||||||
|
@ -1239,7 +1238,7 @@ cfs_write(int fd, const void *buf, unsigned size)
|
||||||
COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
|
COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
|
||||||
fdp->offset += size;
|
fdp->offset += size;
|
||||||
#if COFFEE_MICRO_LOGS
|
#if COFFEE_MICRO_LOGS
|
||||||
}
|
}
|
||||||
#endif /* COFFEE_MICRO_LOGS */
|
#endif /* COFFEE_MICRO_LOGS */
|
||||||
|
|
||||||
if(fdp->offset > file->end) {
|
if(fdp->offset > file->end) {
|
||||||
|
|
Loading…
Reference in a new issue