Changeset 7715994 in mainline for uspace/app


Ignore:
Timestamp:
2010-03-13T12:17:02Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6ba20a6b
Parents:
d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/app
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/cmds/builtins/cd/cd.c

    rd0febca r7715994  
    4141#include "cd.h"
    4242
    43 static char * cmdname = "cd";
     43static const char *cmdname = "cd";
    4444
    4545void help_cmd_cd(unsigned int level)

  • uspace/app/bdsh/cmds/cmds.h

    rd0febca r7715994  
    3333/* Module structure */
    3434typedef struct {
    35         char *name;         /* Name of the command */
    36         char *desc;         /* Description of the command */
     35        const char *name;   /* Name of the command */
     36        const char *desc;   /* Description of the command */
    3737        mod_entry_t entry;  /* Command (exec) entry function */
    3838        mod_help_t help;    /* Command (help) entry function */
    … …  
    4141/* Builtin structure, same as modules except different types of entry points */
    4242typedef struct {
    43         char *name;
    44         char *desc;
     43        const char *name;
     44        const char *desc;
    4545        builtin_entry_t entry;
    4646        builtin_help_t help;
    … …  
    5757extern int is_module(const char *);
    5858extern int is_module_alias(const char *);
    59 extern char * alias_for_module(const char *);
     59extern char *alias_for_module(const char *);
    6060extern int help_module(int, unsigned int);
    6161extern int run_module(int, char *[]);
    … …  
    6565extern int is_builtin(const char *);
    6666extern int is_builtin_alias(const char *);
    67 extern char * alias_for_builtin(const char *);
     67extern char *alias_for_builtin(const char *);
    6868extern int help_builtin(int, unsigned int);
    6969extern int run_builtin(int, char *[], cliuser_t *);

  • uspace/app/bdsh/cmds/modules/cat/cat.c

    rd0febca r7715994  
    4343#include "cmds.h"
    4444
    45 static char *cmdname = "cat";
     45static const char *cmdname = "cat";
    4646#define CAT_VERSION "0.0.1"
    4747#define CAT_DEFAULT_BUFLEN 1024
    4848
    49 static char *cat_oops = "That option is not yet supported\n";
     49static const char *cat_oops = "That option is not yet supported\n";
    5050
    5151static struct option const long_options[] = {

  • uspace/app/bdsh/cmds/modules/help/help.c

    rd0febca r7715994  
    4242#include "util.h"
    4343
    44 static char *cmdname = "help";
     44static const char *cmdname = "help";
    4545extern const char *progname;
    4646

  • uspace/app/bdsh/cmds/modules/kcon/kcon.c

    rd0febca r7715994  
    4040#include "cmds.h"
    4141
    42 static char *cmdname = "kcon";
     42static const char *cmdname = "kcon";
    4343
    4444/* Dispays help for kcon in various levels */

  • uspace/app/bdsh/cmds/modules/ls/ls.c

    rd0febca r7715994  
    4949#include "cmds.h"
    5050
    51 static char *cmdname = "ls";
     51static const char *cmdname = "ls";
    5252
    5353static void ls_scan_dir(const char *d, DIR *dirp)

  • uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

    rd0febca r7715994  
    4949#define MKDIR_VERSION "0.0.1"
    5050
    51 static char *cmdname = "mkdir";
     51static const char *cmdname = "mkdir";
    5252
    5353static struct option const long_options[] = {

  • uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

    rd0febca r7715994  
    5151#define BUFFER_SIZE 16384
    5252
    53 static char *cmdname = "mkfile";
     53static const char *cmdname = "mkfile";
    5454
    5555static struct option const long_options[] = {

  • uspace/app/bdsh/cmds/modules/module_aliases.h

    rd0febca r7715994  
    1212 * the entry point being reached. */
    1313
    14 char *mod_aliases[] = {
     14const char *mod_aliases[] = {
    1515        "ren", "mv",
    1616        "umount", "unmount",

  • uspace/app/bdsh/cmds/modules/mount/mount.c

    rd0febca r7715994  
    5858{
    5959        unsigned int argc;
    60         char *mopts = "";
     60        const char *mopts = "";
    6161        int rc;
    6262

  • uspace/app/bdsh/cmds/modules/pwd/pwd.c

    rd0febca r7715994  
    3939#include "pwd.h"
    4040
    41 static char * cmdname = "pwd";
     41static const char *cmdname = "pwd";
    4242
    4343void help_cmd_pwd(unsigned int level)

  • uspace/app/bdsh/cmds/modules/rm/rm.c

    rd0febca r7715994  
    4545#include "cmds.h"
    4646
    47 static char *cmdname = "rm";
     47static const char *cmdname = "rm";
    4848#define RM_VERSION "0.0.1"
    4949

  • uspace/app/bdsh/cmds/modules/sleep/sleep.c

    rd0febca r7715994  
    3838#include "cmds.h"
    3939
    40 static char *cmdname = "sleep";
     40static const char *cmdname = "sleep";
    4141
    4242/* Dispays help for sleep in various levels */

  • uspace/app/bdsh/cmds/modules/touch/touch.c

    rd0febca r7715994  
    4747#include "cmds.h"
    4848
    49 static char *cmdname = "touch";
     49static const char *cmdname = "touch";
    5050
    5151/* Dispays help for touch in various levels */

  • uspace/app/bdsh/errors.c

    rd0febca r7715994  
    4747/* Look up errno in cl_errors and return the corresponding string.
    4848 * Return NULL if not found */
    49 static char *err2str(int err)
     49static const char *err2str(int err)
    5050{
    5151

  • uspace/app/bdsh/errstr.h

    rd0febca r7715994  
    44/* Simple array to translate error codes to meaningful strings */
    55
    6 static char *cl_errors[] = {
     6static const char *cl_errors[] = {
    77        "Success",
    88        "Failure",
    … …  
    1818};
    1919
    20 static char *err2str(int);
     20static const char *err2str(int);
    2121
    2222#endif

  • uspace/app/bdsh/exec.c

    rd0febca r7715994  
    120120        free(found);
    121121
    122         tid = task_spawn((const char *)tmp, argv);
     122        tid = task_spawn(tmp, (const char **) argv);
    123123        free(tmp);
    124124

  • uspace/app/bdsh/exec.h

    rd0febca r7715994  
    55
    66extern unsigned int try_exec(char *, char **);
     7
    78#endif

  • uspace/app/bdsh/scli.h

    rd0febca r7715994  
    66
    77typedef struct {
    8         char *name;
     8        const char *name;
    99        char *line;
    1010        char *cwd;

  • uspace/app/edit/edit.c

    rd0febca r7715994  
    475475static void file_save_as(void)
    476476{
    477         char *old_fname, *fname;
    478         int rc;
    479 
    480         old_fname = (doc.file_name != NULL) ? doc.file_name : "";
     477        const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
     478        char *fname;
     479       
    481480        fname = filename_prompt("Save As", old_fname);
    482481        if (fname == NULL) {
    … …  
    485484        }
    486485
    487         rc = file_save(fname);
     486        int rc = file_save(fname);
    488487        if (rc != EOK)
    489488                return;
    … …  
    819818        spt_t caret_pt;
    820819        coord_t coord;
    821         char *fname;
    822         int n;
    823820
    824821        tag_get_pt(&pane.caret_pos, &caret_pt);
    825822        spt_get_coord(&caret_pt, &coord);
    826823
    827         fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
     824        const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
    828825
    829826        console_goto(con, 0, scr_rows - 1);
    830827        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
    831         n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
     828        int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
    832829            "Ctrl-E Save As", coord.row, coord.column, fname);
    833830        printf("%*s", scr_columns - 1 - n, "");

  • uspace/app/getterm/getterm.c

    rd0febca r7715994  
    6969}
    7070
    71 static task_id_t spawn(char *fname)
     71static task_id_t spawn(const char *fname)
    7272{
    73         char *args[2];
     73        const char *args[2];
    7474       
    7575        args[0] = fname;

  • uspace/app/getterm/version.c

    rd0febca r7715994  
    4040#include "version.h"
    4141
    42 static char *release = STRING(RELEASE);
    43 static char *name = STRING(NAME);
    44 static char *arch = STRING(UARCH);
     42static const char *release = STRING(RELEASE);
     43static const char *name = STRING(NAME);
     44static const char *arch = STRING(UARCH);
    4545
    4646#ifdef REVISION
    47         static char *revision = ", revision " STRING(REVISION);
     47        static const char *revision = ", revision " STRING(REVISION);
    4848#else
    49         static char *revision = "";
     49        static const char *revision = "";
    5050#endif
    5151
    5252#ifdef TIMESTAMP
    53         static char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
     53        static const char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    5454#else
    55         static char *timestamp = "";
     55        static const char *timestamp = "";
    5656#endif
    5757

  • uspace/app/init/init.c

    rd0febca r7715994  
    6262static bool mount_root(const char *fstype)
    6363{
    64         char *opts = "";
     64        const char *opts = "";
    6565        const char *root_dev = "bd/initrd";
    6666       
    … …  
    117117}
    118118
    119 static void spawn(char *fname)
    120 {
    121         char *argv[2];
     119static void spawn(const char *fname)
     120{
     121        const char *argv[2];
    122122        struct stat s;
    123123       
    … …  
    134134}
    135135
    136 static void srv_start(char *fname)
    137 {
    138         char *argv[2];
     136static void srv_start(const char *fname)
     137{
     138        const char *argv[2];
    139139        task_id_t id;
    140140        task_exit_t texit;
    … …  
    168168}
    169169
    170 static void console(char *dev)
    171 {
    172         char *argv[3];
     170static void console(const char *dev)
     171{
     172        const char *argv[3];
    173173        char hid_in[DEVMAP_NAME_MAXLEN];
    174174        int rc;
    … …  
    193193}
    194194
    195 static void getterm(char *dev, char *app)
    196 {
    197         char *argv[4];
     195static void getterm(const char *dev, const char *app)
     196{
     197        const char *argv[4];
    198198        char term[DEVMAP_NAME_MAXLEN];
    199199        int rc;

  • uspace/app/redir/redir.c

    rd0febca r7715994  
    7272static task_id_t spawn(int argc, char *argv[])
    7373{
    74         char **args = (char **) calloc(argc + 1, sizeof(char *));
     74        const char **args = (const char **) calloc(argc + 1, sizeof(char *));
    7575        if (!args) {
    7676                printf("No memory available\n");

  • uspace/app/sbi/src/os/helenos.c

    rd0febca r7715994  
    105105        int retval;
    106106
    107         tid = task_spawn(cmd[0], cmd);
     107        tid = task_spawn(cmd[0], (char const * const *) cmd);
    108108        if (tid == 0) {
    109109                printf("Error: Failed spawning '%s'.\n", cmd[0]);

  • uspace/app/tester/console/console1.c

    rd0febca r7715994  
    3636#include "../tester.h"
    3737
    38 const char *color_name[] = {
     38static const char *color_name[] = {
    3939        [COLOR_BLACK] = "black",
    4040        [COLOR_BLUE] = "blue",
    … …  
    4747};
    4848
    49 char *test_console1(void)
     49const char *test_console1(void)
    5050{
    5151        if (!test_quiet) {

  • uspace/app/tester/fault/fault1.c

    rd0febca r7715994  
    3030#include "../tester.h"
    3131
    32 char *test_fault1(void)
     32const char *test_fault1(void)
    3333{
    3434        ((int *)(0))[1] = 0;

  • uspace/app/tester/fault/fault2.c

    rd0febca r7715994  
    3232typedef int __attribute__((may_alias)) aliasing_int;
    3333
    34 char *test_fault2(void)
     34const char *test_fault2(void)
    3535{
    3636        volatile long long var;

  • uspace/app/tester/fault/fault3.c

    rd0febca r7715994  
    3030#include <stdlib.h>
    3131
    32 char *test_fault3(void)
     32const char *test_fault3(void)
    3333{
    3434        abort();

  • uspace/app/tester/ipc/connect.c

    rd0febca r7715994  
    3939}
    4040
    41 char *test_connect(void)
     41const char *test_connect(void)
    4242{
    4343        TPRINTF("Connecting to %u...", IPC_TEST_SERVICE);

  • uspace/app/tester/ipc/ping_pong.c

    rd0febca r7715994  
    3838#define COUNT_GRANULARITY  100
    3939
    40 char *test_ping_pong(void)
     40const char *test_ping_pong(void)
    4141{
    4242        TPRINTF("Pinging ns server for %d seconds...", DURATION_SECS);

  • uspace/app/tester/ipc/register.c

    rd0febca r7715994  
    7474}
    7575
    76 char *test_register(void)
     76const char *test_register(void)
    7777{
    7878        async_set_client_connection(client_connection);

  • uspace/app/tester/loop/loop1.c

    rd0febca r7715994  
    3131#include "../tester.h"
    3232
    33 char *test_loop1(void)
     33const char *test_loop1(void)
    3434{
    3535        TPRINTF("Looping...");

  • uspace/app/tester/mm/malloc1.c

    rd0febca r7715994  
    7373
    7474typedef struct {
    75         char *name;
     75        const char *name;
    7676        sp_term_cond_s cond;
    7777        sp_action_prob_s prob;
    … …  
    9090
    9191typedef struct {
    92         char *name;
     92        const char *name;
    9393        ph_alloc_size_s alloc;
    9494        subphase_s *subphases;
    … …  
    628628}
    629629
    630 char *test_malloc1(void)
     630const char *test_malloc1(void)
    631631{
    632632        init_mem();

  • uspace/app/tester/print/print1.c

    rd0febca r7715994  
    3131#include "../tester.h"
    3232
    33 char *test_print1(void)
     33const char *test_print1(void)
    3434{
    3535        TPRINTF("Testing printf(\"%%*.*s\", 5, 3, \"text\"):\n");

  • uspace/app/tester/print/print2.c

    rd0febca r7715994  
    3131#include "../tester.h"
    3232
    33 char *test_print2(void)
     33const char *test_print2(void)
    3434{
    3535        TPRINTF("Testing printf(\"%%c %%3.2c %%-3.2c %%2.3c %%-2.3c\", 'a', 'b', 'c', 'd', 'e'):\n");

  • uspace/app/tester/print/print3.c

    rd0febca r7715994  
    3434#define BUFFER_SIZE  32
    3535
    36 char *test_print3(void)
     36const char *test_print3(void)
    3737{
    3838        char buffer[BUFFER_SIZE];

  • uspace/app/tester/print/print4.c

    rd0febca r7715994  
    3131#include "../tester.h"
    3232
    33 char *test_print4(void)
     33const char *test_print4(void)
    3434{
    3535        TPRINTF("ASCII printable characters (32 - 127) using printf(\"%%c\") and printf(\"%%lc\"):\n");

  • uspace/app/tester/stdio/stdio1.c

    rd0febca r7715994  
    3636static char buf[BUF_SIZE + 1];
    3737
    38 char *test_stdio1(void)
     38const char *test_stdio1(void)
    3939{
    4040        FILE *file;
    41         char *file_name = "/readme";
     41        const char *file_name = "/readme";
    4242       
    4343        TPRINTF("Open file \"%s\"...", file_name);

  • uspace/app/tester/stdio/stdio2.c

    rd0febca r7715994  
    3232#include "../tester.h"
    3333
    34 char *test_stdio2(void)
     34const char *test_stdio2(void)
    3535{
    3636        FILE *file;
    37         char *file_name = "/test";
     37        const char *file_name = "/test";
    3838       
    3939        TPRINTF("Open file \"%s\" for writing...", file_name);

  • uspace/app/tester/tester.c

    rd0febca r7715994  
    6969{
    7070        /* Execute the test */
    71         char *ret = test->entry();
     71        const char *ret = test->entry();
    7272       
    7373        if (ret == NULL) {

  • uspace/app/tester/tester.h

    rd0febca r7715994  
    5454        }
    5555
    56 typedef char *(*test_entry_t)(void);
     56typedef const char *(*test_entry_t)(void);
    5757
    5858typedef struct {
    59         char *name;
    60         char *desc;
     59        const char *name;
     60        const char *desc;
    6161        test_entry_t entry;
    6262        bool safe;
    6363} test_t;
    6464
    65 extern char *test_thread1(void);
    66 extern char *test_print1(void);
    67 extern char *test_print2(void);
    68 extern char *test_print3(void);
    69 extern char *test_print4(void);
    70 extern char *test_console1(void);
    71 extern char *test_stdio1(void);
    72 extern char *test_stdio2(void);
    73 extern char *test_fault1(void);
    74 extern char *test_fault2(void);
    75 extern char *test_fault3(void);
    76 extern char *test_vfs1(void);
    77 extern char *test_ping_pong(void);
    78 extern char *test_register(void);
    79 extern char *test_connect(void);
    80 extern char *test_loop1(void);
    81 extern char *test_malloc1(void);
     65extern const char *test_thread1(void);
     66extern const char *test_print1(void);
     67extern const char *test_print2(void);
     68extern const char *test_print3(void);
     69extern const char *test_print4(void);
     70extern const char *test_console1(void);
     71extern const char *test_stdio1(void);
     72extern const char *test_stdio2(void);
     73extern const char *test_fault1(void);
     74extern const char *test_fault2(void);
     75extern const char *test_fault3(void);
     76extern const char *test_vfs1(void);
     77extern const char *test_ping_pong(void);
     78extern const char *test_register(void);
     79extern const char *test_connect(void);
     80extern const char *test_loop1(void);
     81extern const char *test_malloc1(void);
    8282
    8383extern test_t tests[];

  • uspace/app/tester/thread/thread1.c

    rd0febca r7715994  
    5050}
    5151
    52 char *test_thread1(void)
     52const char *test_thread1(void)
    5353{
    5454        unsigned int i;

  • uspace/app/tester/vfs/vfs1.c

    rd0febca r7715994  
    5454static char text[] = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
    5555
    56 static char *read_root(void)
     56static const char *read_root(void)
    5757{
    5858        TPRINTF("Opening the root directory...");
    … …  
    7373}
    7474
    75 char *test_vfs1(void)
     75const char *test_vfs1(void)
    7676{
    7777        if (mkdir(MOUNT_POINT, 0) != 0)
    … …  
    121121        close(fd0);
    122122       
    123         char *rv = read_root();
     123        const char *rv = read_root();
    124124        if (rv != NULL)
    125125                return rv;

  • uspace/app/tetris/screen.c

    rd0febca r7715994  
    7272 * simply literal strings);
    7373 */
    74 static inline void putstr(char *s)
     74static inline void putstr(const char *s)
    7575{
    7676        while (*s)
    … …  
    181181}
    182182
    183 void stop(char *why)
     183void stop(const char *why)
    184184{
    185185        if (isset)

  • uspace/app/tetris/tetris.h

    rd0febca r7715994  
    186186extern int fits_in(const struct shape *, int);
    187187extern void place(const struct shape *, int, int);
    188 extern void stop(char *);
     188extern void stop(const char *);
    189189
    190190/** @}

  • uspace/app/trace/errors.h

    rd0febca r7715994  
    3737
    3838typedef struct {
    39         char *name;     /**< Error value name (Exx) */
    40         char *desc;     /**< Error description */
     39        const char *name;  /**< Error value name (Exx) */
     40        const char *desc;  /**< Error description */
    4141} err_desc_t;
    4242

  • uspace/app/trace/ipc_desc.h

    rd0febca r7715994  
    3838typedef struct {
    3939        int number;
    40         char *name;
     40        const char *name;
    4141} ipc_m_desc_t;
    4242

  • uspace/app/trace/proto.c

    rd0febca r7715994  
    157157}
    158158
    159 static void proto_struct_init(proto_t *proto, char *name)
     159static void proto_struct_init(proto_t *proto, const char *name)
    160160{
    161161        proto->name = name;
    … …  
    164164}
    165165
    166 proto_t *proto_new(char *name)
     166proto_t *proto_new(const char *name)
    167167{
    168168        proto_t *p;
    … …  
    206206}
    207207
    208 static void oper_struct_init(oper_t *oper, char *name)
     208static void oper_struct_init(oper_t *oper, const char *name)
    209209{
    210210        oper->name = name;
    211211}
    212212
    213 oper_t *oper_new(char *name, int argc, val_type_t *arg_types,
     213oper_t *oper_new(const char *name, int argc, val_type_t *arg_types,
    214214    val_type_t rv_type, int respc, val_type_t *resp_types)
    215215{

  • uspace/app/trace/proto.h

    rd0febca r7715994  
    4343
    4444typedef struct {
    45         char *name;
     45        const char *name;
    4646
    4747        int argc;
    … …  
    5656typedef struct {
    5757        /** Protocol name */
    58         char *name;
     58        const char *name;
    5959
    6060        /** Maps method number to operation */
    … …  
    7070void proto_register(int srv, proto_t *proto);
    7171proto_t *proto_get_by_srv(int srv);
    72 proto_t *proto_new(char *name);
     72proto_t *proto_new(const char *name);
    7373void proto_delete(proto_t *proto);
    7474void proto_add_oper(proto_t *proto, int method, oper_t *oper);
    7575oper_t *proto_get_oper(proto_t *proto, int method);
    7676
    77 oper_t *oper_new(char *name, int argc, val_type_t *arg_types,
     77oper_t *oper_new(const char *name, int argc, val_type_t *arg_types,
    7878    val_type_t rv_type, int respc, val_type_t *resp_types);
    7979

  • uspace/app/trace/syscalls.h

    rd0febca r7715994  
    3939
    4040typedef struct {
    41         char *name;
     41        const char *name;
    4242        int n_args;
    4343        val_type_t rv_type;

  • uspace/app/trace/trace.c

    rd0febca r7715994  
    585585}
    586586
    587 static loader_t *preload_task(const char *path, char *const argv[],
     587static loader_t *preload_task(const char *path, char **argv,
    588588    task_id_t *task_id)
    589589{
    … …  
    591591        int rc;
    592592
    593         /* Spawn a program loader */   
     593        /* Spawn a program loader */
    594594        ldr = loader_connect();
    595595        if (ldr == NULL)
    … …  
    607607
    608608        /* Send arguments */
    609         rc = loader_set_args(ldr, argv);
     609        rc = loader_set_args(ldr, (const char **) argv);
    610610        if (rc != EOK)
    611611                goto error;
    … …  
    870870}
    871871
    872 static display_mask_t parse_display_mask(char *text)
     872static display_mask_t parse_display_mask(const char *text)
    873873{
    874874        display_mask_t dm;
    875         char *c;
    876 
    877         c = text;
    878 
     875        const char *c = text;
     876       
    879877        while (*c) {
    880878                switch (*c) {
    881                 case 't': dm = dm | DM_THREAD; break;
    882                 case 's': dm = dm | DM_SYSCALL; break;
    883                 case 'i': dm = dm | DM_IPC; break;
    884                 case 'p': dm = dm | DM_SYSTEM | DM_USER; break;
     879                case 't':
     880                        dm = dm | DM_THREAD;
     881                        break;
     882                case 's':
     883                        dm = dm | DM_SYSCALL;
     884                        break;
     885                case 'i':
     886                        dm = dm | DM_IPC;
     887                        break;
     888                case 'p':
     889                        dm = dm | DM_SYSTEM | DM_USER;
     890                        break;
    885891                default:
    886892                        printf("Unexpected event type '%c'.\n", *c);
    887893                        exit(1);
    888894                }
    889 
     895               
    890896                ++c;
    891897        }
    892 
     898       
    893899        return dm;
    894900}
    … …  
    896902static int parse_args(int argc, char *argv[])
    897903{
    898         char *arg;
    899904        char *err_p;
    900905
    901906        task_id = 0;
    902907
    903         --argc; ++argv;
     908        --argc;
     909        ++argv;
    904910
    905911        while (argc > 0) {
    906                 arg = *argv;
     912                char *arg = *argv;
    907913                if (arg[0] == '+') {
    908914                        display_mask = parse_display_mask(&arg[1]);
    … …  
    910916                        if (arg[1] == 't') {
    911917                                /* Trace an already running task */
    912                                 --argc; ++argv;
     918                                --argc;
     919                                ++argv;
    913920                                task_id = strtol(*argv, &err_p, 10);
    914921                                task_ldr = NULL;
    … …  
    927934                        break;
    928935                }
    929 
    930                 --argc; ++argv;
     936               
     937                --argc;
     938                ++argv;
    931939        }
    932940
    933941        if (task_id != 0) {
    934                 if (argc == 0) return 0;
     942                if (argc == 0)
     943                        return 0;
    935944                printf("Extra arguments\n");
    936945                print_syntax();
    … …  
    946955        /* Preload the specified program file. */
    947956        printf("Spawning '%s' with arguments:\n", *argv);
    948         {
    949                 char **cp = argv;
    950                 while (*cp) printf("'%s'\n", *cp++);
    951         }
     957       
     958        char **cp = argv;
     959        while (*cp)
     960                printf("'%s'\n", *cp++);
     961       
    952962        task_ldr = preload_task(*argv, argv, &task_id);
    953963        task_wait_for = true;
Note: See TracChangeset for help on using the changeset viewer.