Changeset 1e57186 in rtems

Timestamp:

10/25/99 14:46:56 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9cc603ff

Parents:

04df848

Message:

Patch from Eric Valette <valette@…> and Emmanuel Raguet
<raguet@…> to use a local variable.

Files:

• c/src/exec/libfs/src/imfs/imfs_gtkn.c (modified) (2 diffs)
• c/src/lib/libc/imfs_gtkn.c (modified) (2 diffs)
• c/src/libfs/src/imfs/imfs_gtkn.c (modified) (2 diffs)
• cpukit/libfs/src/imfs/imfs_gtkn.c (modified) (2 diffs)

c/src/exec/libfs/src/imfs/imfs_gtkn.c

@@ -26 +26 @@
 )
 {
-  int               i = 0;
+  register int i = 0;
   IMFS_token_types  type = IMFS_NAME;
+  register char c;
 
   /* 
    *  Copy a name into token.  (Remember NULL is a token.)
    */
+  c = path[i];
+  while ( (!IMFS_is_separator(c)) && (i <= IMFS_NAME_MAX) ) {
 
-  while ( !IMFS_is_separator( path[i] ) && (i <= IMFS_NAME_MAX) ) {
-
-     token[i] = path[i];
+     token[i] = c;
 
      if (i == IMFS_NAME_MAX)
        return IMFS_INVALID_TOKEN;
 
-     if ( !IMFS_is_valid_name_char( token[i] ) )
+     if ( !IMFS_is_valid_name_char(c) )
        type = IMFS_INVALID_TOKEN;   
 
-     i++;
+     c = path [++i];
   }
 
@@ -51 +52 @@
 
   if ( i == 0 ) {
-    token[i] = path[i];
+    token[i] = c;
 
     if ( token[i] != '\0' ) {

c/src/lib/libc/imfs_gtkn.c

@@ -26 +26 @@
 )
 {
-  int               i = 0;
+  register int i = 0;
   IMFS_token_types  type = IMFS_NAME;
+  register char c;
 
   /* 
    *  Copy a name into token.  (Remember NULL is a token.)
    */
+  c = path[i];
+  while ( (!IMFS_is_separator(c)) && (i <= IMFS_NAME_MAX) ) {
 
-  while ( !IMFS_is_separator( path[i] ) && (i <= IMFS_NAME_MAX) ) {
-
-     token[i] = path[i];
+     token[i] = c;
 
      if (i == IMFS_NAME_MAX)
        return IMFS_INVALID_TOKEN;
 
-     if ( !IMFS_is_valid_name_char( token[i] ) )
+     if ( !IMFS_is_valid_name_char(c) )
        type = IMFS_INVALID_TOKEN;   
 
-     i++;
+     c = path [++i];
   }
 
@@ -51 +52 @@
 
   if ( i == 0 ) {
-    token[i] = path[i];
+    token[i] = c;
 
     if ( token[i] != '\0' ) {

c/src/libfs/src/imfs/imfs_gtkn.c

@@ -26 +26 @@
 )
 {
-  int               i = 0;
+  register int i = 0;
   IMFS_token_types  type = IMFS_NAME;
+  register char c;
 
   /* 
    *  Copy a name into token.  (Remember NULL is a token.)
    */
+  c = path[i];
+  while ( (!IMFS_is_separator(c)) && (i <= IMFS_NAME_MAX) ) {
 
-  while ( !IMFS_is_separator( path[i] ) && (i <= IMFS_NAME_MAX) ) {
-
-     token[i] = path[i];
+     token[i] = c;
 
      if (i == IMFS_NAME_MAX)
        return IMFS_INVALID_TOKEN;
 
-     if ( !IMFS_is_valid_name_char( token[i] ) )
+     if ( !IMFS_is_valid_name_char(c) )
        type = IMFS_INVALID_TOKEN;   
 
-     i++;
+     c = path [++i];
   }
 
@@ -51 +52 @@
 
   if ( i == 0 ) {
-    token[i] = path[i];
+    token[i] = c;
 
     if ( token[i] != '\0' ) {

cpukit/libfs/src/imfs/imfs_gtkn.c

@@ -26 +26 @@
 )
 {
-  int               i = 0;
+  register int i = 0;
   IMFS_token_types  type = IMFS_NAME;
+  register char c;
 
   /* 
    *  Copy a name into token.  (Remember NULL is a token.)
    */
+  c = path[i];
+  while ( (!IMFS_is_separator(c)) && (i <= IMFS_NAME_MAX) ) {
 
-  while ( !IMFS_is_separator( path[i] ) && (i <= IMFS_NAME_MAX) ) {
-
-     token[i] = path[i];
+     token[i] = c;
 
      if (i == IMFS_NAME_MAX)
        return IMFS_INVALID_TOKEN;
 
-     if ( !IMFS_is_valid_name_char( token[i] ) )
+     if ( !IMFS_is_valid_name_char(c) )
        type = IMFS_INVALID_TOKEN;   
 
-     i++;
+     c = path [++i];
   }
 
@@ -51 +52 @@
 
   if ( i == 0 ) {
-    token[i] = path[i];
+    token[i] = c;
 
     if ( token[i] != '\0' ) {