/branches/dd/uspace/app/bdsh/cmds/modules/cp/cp.c |
---|
172,7 → 172,8 |
int cmd_cp(char **argv) |
{ |
unsigned int argc, buffer = 0, verbose = 0; |
unsigned int argc, verbose = 0; |
int buffer = 0; |
int c, opt_ind; |
int64_t ret; |
/branches/dd/uspace/app/bdsh/cmds/modules/ls/ls.c |
---|
89,7 → 89,8 |
struct stat s; |
int rc; |
if (rc = stat(pathname, &s)) { |
rc = stat(pathname, &s); |
if (rc != 0) { |
/* Odd chance it was deleted from the time readdir() found it */ |
printf("ls: skipping bogus node %s\n", pathname); |
printf("rc=%d\n", rc); |
/branches/dd/uspace/app/bdsh/cmds/modules/ls/ls.h |
---|
6,8 → 6,6 |
#define LS_FILE 1 |
#define LS_DIR 2 |
static unsigned int ls_scope(const char *); |
static void ls_scan_dir(const char *, DIR *); |
static void ls_print(const char *, const char *); |
/branches/dd/uspace/app/bdsh/cmds/modules/rm/rm.c |
---|
209,7 → 209,7 |
} |
} |
if (optind == argc) { |
if ((unsigned) optind == argc) { |
cli_error(CL_EFAIL, |
"%s: insufficient arguments. Try %s --help", cmdname, cmdname); |
rm_end(&rm); |
/branches/dd/uspace/app/init/init.c |
---|
202,7 → 202,7 |
} |
} |
void mount_data(void) |
static void mount_data(void) |
{ |
int rc; |
245,9 → 245,14 |
#ifdef CONFIG_START_BD |
srv_start("/srv/ata_bd"); |
srv_start("/srv/gxe_bd"); |
#endif |
#else |
(void) srv_start; |
#endif |
#ifdef CONFIG_MOUNT_DATA |
mount_data(); |
#else |
(void) mount_data; |
#endif |
getvc("vc0", "/app/bdsh"); |
/branches/dd/uspace/app/tester/thread/thread1.c |
---|
38,7 → 38,6 |
static atomic_t finish; |
static atomic_t threads_finished; |
static bool sh_quiet; |
static void threadtest(void *data) |
{ |
53,7 → 52,7 |
char *test_thread1(void) |
{ |
unsigned int i; |
unsigned int total = 0; |
int total = 0; |
atomic_set(&finish, 1); |
atomic_set(&threads_finished, 0); |
/branches/dd/uspace/app/tetris/shapes.c |
---|
87,7 → 87,7 |
*/ |
int fits_in(const struct shape *shape, int pos) |
{ |
int *o = shape->off; |
const int *o = shape->off; |
if ((board[pos]) || (board[pos + *o++]) || (board[pos + *o++]) || |
(board[pos + *o])) |
102,7 → 102,7 |
*/ |
void place(const struct shape *shape, int pos, int onoff) |
{ |
int *o = shape->off; |
const int *o = shape->off; |
board[pos] = onoff ? shape->color : 0x000000; |
board[pos + *o++] = onoff ? shape->color : 0x000000; |
/branches/dd/uspace/app/tetris/tetris.c |
---|
237,7 → 237,7 |
{ |
int pos; |
int c; |
char *keys; |
const char *keys; |
int level = 2; |
char key_write[6][10]; |
int i; |
/branches/dd/uspace/app/trace/trace.c |
---|
206,6 → 206,10 |
void val_print(sysarg_t val, val_type_t v_type) |
{ |
long sval; |
sval = (long) val; |
switch (v_type) { |
case V_VOID: |
printf("<void>"); |
212,7 → 216,7 |
break; |
case V_INTEGER: |
printf("%ld", val); |
printf("%ld", sval); |
break; |
case V_HASH: |
221,29 → 225,29 |
break; |
case V_ERRNO: |
if (val >= -15 && val <= 0) { |
printf("%ld %s (%s)", val, |
err_desc[-val].name, |
err_desc[-val].desc); |
if (sval >= -15 && sval <= 0) { |
printf("%ld %s (%s)", sval, |
err_desc[-sval].name, |
err_desc[-sval].desc); |
} else { |
printf("%ld", val); |
printf("%ld", sval); |
} |
break; |
case V_INT_ERRNO: |
if (val >= -15 && val < 0) { |
printf("%ld %s (%s)", val, |
err_desc[-val].name, |
err_desc[-val].desc); |
if (sval >= -15 && sval < 0) { |
printf("%ld %s (%s)", sval, |
err_desc[-sval].name, |
err_desc[-sval].desc); |
} else { |
printf("%ld", val); |
printf("%ld", sval); |
} |
break; |
case V_CHAR: |
if (val >= 0x20 && val < 0x7f) { |
printf("'%c'", val); |
if (sval >= 0x20 && sval < 0x7f) { |
printf("'%c'", sval); |
} else { |
switch (val) { |
switch (sval) { |
case '\a': printf("'\\a'"); break; |
case '\b': printf("'\\b'"); break; |
case '\n': printf("'\\n'"); break; |
282,7 → 286,8 |
ipc_call_t call; |
ipcarg_t phoneid; |
if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL || |
sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY) |
return; |
phoneid = sc_args[0]; |
302,7 → 307,8 |
ipc_call_t call; |
int rc; |
if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL || |
sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY) |
return; |
memset(&call, 0, sizeof(call)); |
343,11 → 349,13 |
static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args) |
{ |
ipc_call_t question, reply; |
ipc_call_t question; |
int rc; |
memset(&question, 0, sizeof(question)); |
rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args)); |
rc = udebug_mem_read(phoneid, &question.args, sc_args[1], |
sizeof(question.args)); |
if (rc < 0) { |
printf("Error: mem_read->%d\n", rc); |
return; |
358,11 → 366,13 |
static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args) |
{ |
ipc_call_t question, reply; |
ipc_call_t reply; |
int rc; |
memset(&reply, 0, sizeof(reply)); |
rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args)); |
rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], |
sizeof(reply.args)); |
if (rc < 0) { |
printf("Error: mem_read->%d\n", rc); |
return; |
/branches/dd/uspace/app/trace/proto.c |
---|
46,7 → 46,7 |
hash_table_t srv_proto; |
typedef struct { |
int srv; |
unsigned srv; |
proto_t *proto; |
link_t link; |
} srv_proto_t; |
/branches/dd/uspace/lib/libc/include/string.h |
---|
74,8 → 74,8 |
extern void wstr_nstr(char *dst, const wchar_t *src, size_t size); |
extern const char *str_chr(const char *str, wchar_t ch); |
extern const char *str_rchr(const char *str, wchar_t ch); |
extern char *str_chr(const char *str, wchar_t ch); |
extern char *str_rchr(const char *str, wchar_t ch); |
extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); |
extern bool wstr_remove(wchar_t *str, size_t pos); |
/branches/dd/uspace/lib/libc/generic/string.c |
---|
589,7 → 589,7 |
* |
* @return Pointer to character in @a str or NULL if not found. |
*/ |
const char *str_chr(const char *str, wchar_t ch) |
char *str_chr(const char *str, wchar_t ch) |
{ |
wchar_t acc; |
size_t off = 0; |
597,7 → 597,7 |
while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { |
if (acc == ch) |
return (str + last); |
return (char *) (str + last); |
last = off; |
} |
611,7 → 611,7 |
* |
* @return Pointer to character in @a str or NULL if not found. |
*/ |
const char *str_rchr(const char *str, wchar_t ch) |
char *str_rchr(const char *str, wchar_t ch) |
{ |
wchar_t acc; |
size_t off = 0; |
624,7 → 624,7 |
last = off; |
} |
return res; |
return (char *) res; |
} |
/** Insert a wide character into a wide string. |
/branches/dd/uspace/lib/libc/generic/vfs/vfs.c |
---|
366,7 → 366,6 |
int fstat(int fildes, struct stat *stat) |
{ |
ipcarg_t rc; |
ipc_call_t answer; |
aid_t req; |
futex_down(&vfs_phone_futex); |
/branches/dd/uspace/srv/console/console.c |
---|
173,7 → 173,7 |
} |
} |
int ccap_fb_to_con(int ccap_fb, int *ccap_con) |
static int ccap_fb_to_con(int ccap_fb, int *ccap_con) |
{ |
switch (ccap_fb) { |
case FB_CCAP_NONE: *ccap_con = CONSOLE_CCAP_NONE; break; |
/branches/dd/uspace/srv/fb/fb.c |
---|
289,28 → 289,38 |
bgr_888(dst, mask ? 0xffffff : 0); |
} |
static void bgr_555(void *dst, uint32_t rgb) |
static void rgb_555_be(void *dst, uint32_t rgb) |
{ |
uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 5) << 5)) & 0xff; |
uint8_t lo = (GREEN(rgb, 5) >> 3) | (RED(rgb, 5) << 2); |
*((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo); |
*((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 10 | |
GREEN(rgb, 5) << 5 | BLUE(rgb, 5)); |
} |
static void mask_555(void *dst, bool mask) |
static void rgb_555_le(void *dst, uint32_t rgb) |
{ |
bgr_555(dst, mask ? 0xffffff : 0); |
*((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 10 | |
GREEN(rgb, 5) << 5 | BLUE(rgb, 5)); |
} |
static void bgr_565(void *dst, uint32_t rgb) |
static void rgb_565_be(void *dst, uint32_t rgb) |
{ |
uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 6) << 5)) & 0xff; |
uint8_t lo = (GREEN(rgb, 6) >> 3) | (RED(rgb, 5) << 3); |
*((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo); |
*((uint16_t *) dst) = host2uint16_t_be(RED(rgb, 5) << 11 | |
GREEN(rgb, 6) << 5 | BLUE(rgb, 5)); |
} |
static void rgb_565_le(void *dst, uint32_t rgb) |
{ |
*((uint16_t *) dst) = host2uint16_t_le(RED(rgb, 5) << 11 | |
GREEN(rgb, 6) << 5 | BLUE(rgb, 5)); |
} |
static void mask_555(void *dst, bool mask) |
{ |
rgb_555_be(dst, mask ? 0xffffff : 0); |
} |
static void mask_565(void *dst, bool mask) |
{ |
bgr_565(dst, mask ? 0xffffff : 0); |
rgb_565_be(dst, mask ? 0xffffff : 0); |
} |
static void bgr_323(void *dst, uint32_t rgb) |
621,16 → 631,26 |
screen.mask_conv = mask_323; |
screen.pixelbytes = 1; |
break; |
case VISUAL_BGR_5_5_5: |
screen.rgb_conv = bgr_555; |
case VISUAL_RGB_5_5_5_LE: |
screen.rgb_conv = rgb_555_le; |
screen.mask_conv = mask_555; |
screen.pixelbytes = 2; |
break; |
case VISUAL_BGR_5_6_5: |
screen.rgb_conv = bgr_565; |
case VISUAL_RGB_5_5_5_BE: |
screen.rgb_conv = rgb_555_be; |
screen.mask_conv = mask_555; |
screen.pixelbytes = 2; |
break; |
case VISUAL_RGB_5_6_5_LE: |
screen.rgb_conv = rgb_565_le; |
screen.mask_conv = mask_565; |
screen.pixelbytes = 2; |
break; |
case VISUAL_RGB_5_6_5_BE: |
screen.rgb_conv = rgb_565_be; |
screen.mask_conv = mask_565; |
screen.pixelbytes = 2; |
break; |
case VISUAL_RGB_8_8_8: |
screen.rgb_conv = rgb_888; |
screen.mask_conv = mask_888; |
/branches/dd/uspace/srv/fs/fat/fat_ops.c |
---|
402,7 → 402,7 |
fat_dentry_t *d; |
fat_bs_t *bs; |
block_t *b; |
int i, j; |
unsigned i, j; |
uint16_t bps; |
unsigned dps; |
unsigned blocks; |
/branches/dd/uspace/srv/devmap/devmap.c |
---|
546,12 → 546,12 |
ipc_answer_0(iid, EOK); |
size_t name_size = str_size(device->name); |
/* FIXME: |
* We have no channel from DEVMAP to client, therefore |
* sending must be initiated by client. |
* |
* size_t name_size = str_size(device->name); |
* |
* int rc = ipc_data_write_send(phone, device->name, name_size); |
* if (rc != EOK) { |
* async_wait_for(req, NULL); |
/branches/dd/uspace/srv/vfs/vfs_ops.c |
---|
306,7 → 306,7 |
} |
/* Check the offered options size. */ |
if (size < 0 || size > MAX_MNTOPTS_LEN) { |
if (size > MAX_MNTOPTS_LEN) { |
ipc_answer_0(callid, EINVAL); |
ipc_answer_0(rid, EINVAL); |
free(mp); |
447,6 → 447,9 |
int oflag = IPC_GET_ARG2(*request); |
int mode = IPC_GET_ARG3(*request); |
size_t len; |
/* Ignore mode for now. */ |
(void) mode; |
/* |
* Make sure that we are called with exactly one of L_FILE and |
1052,6 → 1055,9 |
return; |
} |
path[len] = '\0'; |
/* Ignore mode for now. */ |
(void) mode; |
fibril_rwlock_write_lock(&namespace_rwlock); |
int lflag = L_DIRECTORY | L_CREATE | L_EXCLUSIVE; |