Changeset 5935c079 in mainline for uspace/app/bdsh/compl.c

Timestamp:

2011-08-21T14:13:01Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ce7cfb, ec7f8b1

Parents:

f90eb75

Message:

preferably use ssize_t for signed size values
cstyle

File:

• uspace/app/bdsh/compl.c (modified) (6 diffs)

uspace/app/bdsh/compl.c

@@ -90 +90 @@
 {
         compl_t *cs = NULL;
-        size_t pref_size;
         char *stext = NULL;
         char *prefix = NULL;
         char *dirname = NULL;
-        char *rpath_sep;
-        static const char *dirlist_arg[] = { ".", NULL };
         int retval;
-        tokenizer_t tok;
+        
         token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
         if (tokens == NULL) {
@@ -103 +100 @@
                 goto error;
         }
-        int current_token;
+        
+        size_t pref_size;
+        char *rpath_sep;
+        static const char *dirlist_arg[] = { ".", NULL };
+        tokenizer_t tok;
+        ssize_t current_token;
         size_t tokens_length;
-
+        
         cs = calloc(1, sizeof(compl_t));
         if (!cs) {
@@ -111 +113 @@
                 goto error;
         }
-
+        
         /* Convert text buffer to string */
         stext = wstr_to_astr(text);
@@ -131 +133 @@
         
         /* Find the current token */
-        for (current_token = 0; current_token < (int) tokens_length;
+        for (current_token = 0; current_token < (ssize_t) tokens_length;
             current_token++) {
                 token_t *t = &tokens[current_token];
                 size_t end = t->char_start + t->char_length;
-                /* Check if the caret lies inside the token or immediately
+                
+                /*
+                 * Check if the caret lies inside the token or immediately
                  * after it
                  */
@@ -142 +146 @@
                 }
         }
-        if (tokens_length == 0) current_token = -1;
-        
-        if (current_token >= 0 && tokens[current_token].type != TOKTYPE_SPACE) {
+        
+        if (tokens_length == 0)
+                current_token = -1;
+        
+        if ((current_token >= 0) && (tokens[current_token].type != TOKTYPE_SPACE))
                 *cstart = tokens[current_token].char_start;
-        }
-        else {
+        else
                 *cstart = pos;
-        }
-        
-        /* Extract the prefix being completed
+        
+        /*
+         * Extract the prefix being completed
          * XXX: handle strings, etc.
          */
@@ -174 +179 @@
 
         /* Skip any whitespace before current token */
-        int prev_token = current_token - 1;
-        if (prev_token >= 0 && tokens[prev_token].type == TOKTYPE_SPACE) {
+        ssize_t prev_token = current_token - 1;
+        if ((prev_token >= 0) && (tokens[prev_token].type == TOKTYPE_SPACE))
                 prev_token--;
-        }
-
+        
         /*
          * It is a command if it is the first token or if it immediately
          * follows a pipe token.
          */
-        if (prev_token < 0 || tokens[prev_token].type == TOKTYPE_SPACE)
+        if ((prev_token < 0) || (tokens[prev_token].type == TOKTYPE_SPACE))
                 cs->is_command = true;
         else