Changeset be6f505 in rtems

Timestamp:

Nov 21, 2012, 11:20:14 AM (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, master

Children:

ad5e070

Parents:

55a36b7

git-author:

Sebastian Huber <sebastian.huber@…> (11/21/12 11:20:14)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/21/12 15:38:34)

Message:

ftpfs: Format

File:

• cpukit/libnetworking/lib/ftpfs.c (modified) (10 diffs)

cpukit/libnetworking/lib/ftpfs.c

@@ -6 +6 @@
 
 /*
- * Copyright (c) 2009-2012
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
+ * Copyright (c) 2009-2012 embedded brains GmbH.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
  *
  * (c) Copyright 2002
@@ -19 +20 @@
  * 82178 Puchheim, Germany
  * <Thomas.Doerfler@imd-systems.de>
- *
- * Modified by Sebastian Huber <sebastian.huber@embedded-brains.de>.
  *
  * This code has been created after closly inspecting "tftpdriver.c" from Eric
@@ -130 +129 @@
   if (rtems_ftpfs_use_timeout(to)) {
     int rv = 0;
-    
+
     rv = setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, to, sizeof(*to));
     if (rv != 0) {
@@ -164 +163 @@
     return RTEMS_INVALID_NAME;
   }
-  
+
   va_start(ap, req);
   rv = ioctl(fd, req, va_arg(ap, void *));
@@ -176 +175 @@
     sc = RTEMS_IO_ERROR;
   }
-  
+
   return sc;
 }
@@ -819 +818 @@
 typedef struct {
   rtems_ftpfs_pasv_state state;
+  size_t index;
   uint8_t data [6];
-  size_t index;
 } rtems_ftpfs_pasv_entry;
 
@@ -829 +828 @@
 )
 {
-  rtems_ftpfs_pasv_entry *e = arg;
+  rtems_ftpfs_pasv_entry *pe = arg;
   size_t i = 0;
 
@@ -835 +834 @@
     int c = buf [i];
 
-    switch (e->state) {
+    switch (pe->state) {
       case RTEMS_FTPFS_PASV_START:
         if (!isdigit(c)) {
-          e->state = RTEMS_FTPFS_PASV_JUNK;
-          e->index = 0;
+          pe->state = RTEMS_FTPFS_PASV_JUNK;
+          pe->index = 0;
         }
         break;
       case RTEMS_FTPFS_PASV_JUNK:
         if (isdigit(c)) {
-          e->state = RTEMS_FTPFS_PASV_DATA;
-          e->data [e->index] = (uint8_t) (c - '0');
+          pe->state = RTEMS_FTPFS_PASV_DATA;
+          pe->data [pe->index] = (uint8_t) (c - '0');
         }
         break;
       case RTEMS_FTPFS_PASV_DATA:
         if (isdigit(c)) {
-          e->data [e->index] = (uint8_t) (e->data [e->index] * 10 + c - '0');
+          pe->data [pe->index] =
+            (uint8_t) (pe->data [pe->index] * 10 + c - '0');
         } else if (c == ',') {
-          ++e->index;
-          if (e->index < sizeof(e->data)) {
-            e->data [e->index] = 0;
+          ++pe->index;
+          if (pe->index < sizeof(pe->data)) {
+            pe->data [pe->index] = 0;
           } else {
-            e->state = RTEMS_FTPFS_PASV_DONE;
+            pe->state = RTEMS_FTPFS_PASV_DONE;
           }
         } else {
-          e->state = RTEMS_FTPFS_PASV_DONE;
+          pe->state = RTEMS_FTPFS_PASV_DONE;
         }
         break;
@@ -882 +882 @@
   uint32_t data_address = 0;
   uint16_t data_port = 0;
-
-  rtems_ftpfs_pasv_entry pe = {
-    .state = RTEMS_FTPFS_PASV_START
-  };
+  rtems_ftpfs_pasv_entry pe;
+
+  memset(&pe, 0, sizeof(pe));
 
   /* Send PASV command */
@@ -899 +898 @@
     return ENOTSUP;
   }
-  data_address = ((uint32_t)(pe.data [0]) << 24) + ((uint32_t)(pe.data [1]) << 16)
-    + ((uint32_t)(pe.data [2]) << 8) + ((uint32_t)(pe.data [3]));
+  data_address = ((uint32_t)(pe.data [0]) << 24)
+    + ((uint32_t)(pe.data [1]) << 16)
+    + ((uint32_t)(pe.data [2]) << 8)
+    + ((uint32_t)(pe.data [3]));
   data_port = (uint16_t) ((pe.data [4] << 8) + pe.data [5]);
   rtems_ftpfs_create_address(&sa, htonl(data_address), htons(data_port));