Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add prototypes. Remove misc. C++-code pollution.

Browse Source
This commit is contained in:
Ralf Corsepius
2008-07-29 09:17:28 +00:00
parent 34b90a86f5
commit 697cdd9871
1 changed files with 6 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
cpukit/telnetd/pty.c
View File

@@ -30,9 +30,6 @@
/* #define DEBUG DEBUG_WH */ /* #define DEBUG DEBUG_WH */
#ifdef __cplusplus
extern "C" {
#endif
/*-----------------------------------------*/ /*-----------------------------------------*/
#include <termios.h> #include <termios.h>
#include <rtems/termiostypes.h> #include <rtems/termiostypes.h>
@@ -42,9 +39,6 @@ extern "C" {
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <errno.h> #include <errno.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef __cplusplus
};
#endif
/*-----------------------------------------*/ /*-----------------------------------------*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -91,11 +85,6 @@ struct pty_tt {
}; };
#ifdef __cplusplus
extern "C" {
#endif
static int telnet_pty_inited=FALSE; static int telnet_pty_inited=FALSE;
static pty_t *telnet_ptys; static pty_t *telnet_ptys;
@@ -469,10 +458,10 @@ rtems_device_driver my_pty_initialize(
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
static int pty_do_finalize() static int pty_do_finalize(void)
{ {
int ndx; int ndx;
rtems_status_code status; rtems_status_code status;
if ( !telnet_pty_inited ) if ( !telnet_pty_inited )
return 0; return 0;
@@ -643,7 +632,7 @@ static const rtems_termios_callbacks * pty_get_termios_handlers(int polled) {
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
static int pty_do_initialize() static int pty_do_initialize(void)
{ {
if ( !telnet_pty_inited ) { if ( !telnet_pty_inited ) {
if (RTEMS_SUCCESSFUL==rtems_io_register_driver(0, &drvPty, &pty_major)) if (RTEMS_SUCCESSFUL==rtems_io_register_driver(0, &drvPty, &pty_major))
@@ -654,46 +643,12 @@ static int pty_do_initialize()
return telnet_pty_inited; return telnet_pty_inited;
} }
#ifdef __cplusplus int telnet_pty_initialize(void)
class TelnetPtyIni {
public:
TelnetPtyIni() {
if (!nest++) {
pty_do_initialize();
}
}
~TelnetPtyIni() {
if (!--nest) {
pty_do_finalize();
}
}
private:
static int nest;
};
static TelnetPtyIni onlyInst;
int TelnetPtyIni::nest=0;
int telnet_pty_initialize()
{
return telnet_pty_inited;
}
int telnet_pty_finalize()
{
return telnet_pty_inited;
}
};
#else
int telnet_pty_initialize()
{ {
return pty_do_initialize(); return pty_do_initialize();
} }
int telnet_pty_finalize() int telnet_pty_finalize(void)
{ {
return pty_do_finalize(); return pty_do_finalize();
} }
#endif