Changeset 652b024 in rtems-libbsd for rtemsbsd/ftpd

Timestamp:

03/18/16 09:35:42 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

c5abeb5

Parents:

a336c46

Message:

ftpd: Resolve function name conflict

Visible with Newlib be657151f12f4d198e45395987f0a626ee1bbb91.

File:

• rtemsbsd/ftpd/ftpd.c (modified) (3 diffs)

rtemsbsd/ftpd/ftpd.c

@@ -1984 +1984 @@
 
 /*
- * daemon
+ * ftpd_daemon
  *
  * This task runs forever.  It waits for service requests on the FTP port
@@ -1997 +1997 @@
  */
 static void
-daemon(rtems_task_argument args __attribute__((unused)))
+ftpd_daemon(rtems_task_argument args __attribute__((unused)))
 {
   int                 s;
@@ -2145 +2145 @@
   if (sc == RTEMS_SUCCESSFUL)
   {
-    sc = rtems_task_start(tid, daemon, 0);
+    sc = rtems_task_start(tid, ftpd_daemon, 0);
     if (sc != RTEMS_SUCCESSFUL)
       rtems_task_delete(tid);