From 29f9a9f316b0a295a4e04adc93725cefafd2ee47 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Tue, 11 Jun 2013 12:52:09 +0200
Subject: [PATCH] Changed some identifiers from files to stdio.
---
src/modules/_Stdio/efuns.c | 4 ++--
src/modules/_Stdio/file.c | 32 +++++++++++---------------------
src/modules/_Stdio/file.h | 15 +++++++++++++++
src/modules/_Stdio/sendfile.c | 4 ++--
src/modules/_Stdio/socket.c | 4 ++--
src/modules/_Stdio/stat.c | 4 ++--
src/modules/_Stdio/udp.c | 5 ++++-
src/program_id.h | 2 +-
8 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/src/modules/_Stdio/efuns.c b/src/modules/_Stdio/efuns.c
index 236a3e9479..6172bf84c0 100644
--- a/src/modules/_Stdio/efuns.c
+++ b/src/modules/_Stdio/efuns.c
@@ -1950,7 +1950,7 @@ void f_errno(INT32 args)
push_int(errno);
}
-void init_files_efuns(void)
+void init_stdio_efuns(void)
{
set_close_on_exec(0,1);
set_close_on_exec(1,1);
@@ -2033,7 +2033,7 @@ void init_files_efuns(void)
ADD_EFUN("strerror",f_strerror,tFunc(tInt,tStr),0);
}
-void exit_files_efuns(void)
+void exit_stdio_efuns(void)
{
#ifdef __NT__
if (kernel32lib) {
diff --git a/src/modules/_Stdio/file.c b/src/modules/_Stdio/file.c
index 4a3e53d1c1..eb24cb37b0 100644
--- a/src/modules/_Stdio/file.c
+++ b/src/modules/_Stdio/file.c
@@ -5735,17 +5735,13 @@ void file_set_notify(INT32 args) {
*! In Pike 7.5 and later OOB operations are always present.
*/
-void exit_files_stat(void);
-void exit_files_efuns(void);
-void exit_sendfile(void);
-void port_exit_program(void);
-
PIKE_MODULE_EXIT
{
- exit_files_efuns();
- exit_files_stat();
+ exit_stdio_efuns();
+ exit_stdio_stat();
- exit_sendfile();
+ exit_stdio_udp();
+ exit_stdio_sendfile();
if(file_program)
{
@@ -5764,7 +5760,7 @@ PIKE_MODULE_EXIT
socketpair_fd = -1;
}
#endif
- port_exit_program();
+ exit_stdio_port();
}
#define REF (*((struct svalue *)(Pike_fp->current_storage)))
@@ -5831,12 +5827,6 @@ void file_tcflush(INT32 args);
/* void file_tcsetpgrp(INT32 args); */
#endif
-void init_files_efuns(void);
-void init_files_stat(void);
-void port_setup_program(void);
-void init_sendfile(void);
-void init_udp(void);
-
/*! @decl string _sprintf(int type, void|mapping flags)
*/
static void fd__sprintf(INT32 args)
@@ -5958,10 +5948,10 @@ PIKE_MODULE_INIT
{
struct object *o;
- Pike_compiler->new_program->id = PROG_MODULE_FILES_ID;
+ Pike_compiler->new_program->id = PROG_MODULE_STDIO_ID;
- init_files_efuns();
- init_files_stat();
+ init_stdio_efuns();
+ init_stdio_stat();
START_NEW_PROGRAM_ID(STDIO_FD);
ADD_STORAGE(struct my_file);
@@ -6039,9 +6029,9 @@ PIKE_MODULE_INIT
file_ref_program=end_program();
add_program_constant("Fd_ref",file_ref_program,0);
- port_setup_program();
- init_sendfile();
- init_udp();
+ init_stdio_port();
+ init_stdio_sendfile();
+ init_stdio_udp();
#if defined(HAVE_FSETXATTR)
/*! @decl constant XATTR_CREATE
diff --git a/src/modules/_Stdio/file.h b/src/modules/_Stdio/file.h
index cc1ab8079d..b3b7dc1a1b 100644
--- a/src/modules/_Stdio/file.h
+++ b/src/modules/_Stdio/file.h
@@ -117,6 +117,21 @@ void low_do_sendfile(struct pike_sendfile *);
void my_set_close_on_exec(int fd, int to);
void do_set_close_on_exec(void);
+void init_stdio_efuns(void);
+void exit_stdio_efuns(void);
+
+void init_stdio_stat(void);
+void exit_stdio_stat(void);
+
+void init_stdio_port(void);
+void exit_stdio_port(void);
+
+void init_stdio_sendfile(void);
+void exit_stdio_sendfile(void);
+
+void init_stdio_udp(void);
+void exit_stdio_udp(void);
+
#define CBFUNCS(X) \
static void PIKE_CONCAT(file_set_,X) (INT32 args); \
static void PIKE_CONCAT(file_query_,X) (INT32 args);
diff --git a/src/modules/_Stdio/sendfile.c b/src/modules/_Stdio/sendfile.c
index ce21cb59d0..1007cf9eea 100644
--- a/src/modules/_Stdio/sendfile.c
+++ b/src/modules/_Stdio/sendfile.c
@@ -1211,7 +1211,7 @@ static void sf_create(INT32 args)
/*
* Module init code
*/
-void init_sendfile(void)
+void init_stdio_sendfile(void)
{
#ifdef _REENTRANT
START_NEW_PROGRAM_ID (STDIO_SENDFILE);
@@ -1234,7 +1234,7 @@ void init_sendfile(void)
#endif /* _REENTRANT */
}
-void exit_sendfile(void)
+void exit_stdio_sendfile(void)
{
#ifdef _REENTRANT
if (pike_sendfile_prog) {
diff --git a/src/modules/_Stdio/socket.c b/src/modules/_Stdio/socket.c
index 8b70981660..2df735b147 100644
--- a/src/modules/_Stdio/socket.c
+++ b/src/modules/_Stdio/socket.c
@@ -720,12 +720,12 @@ static void exit_port_struct(struct object *UNUSED(o))
PMOD_EXPORT struct program *port_program = NULL;
-void port_exit_program(void)
+void exit_stdio_port(void)
{
free_program( port_program );
}
-void port_setup_program(void)
+void init_stdio_port(void)
{
ptrdiff_t offset;
START_NEW_PROGRAM_ID (STDIO_PORT);
diff --git a/src/modules/_Stdio/stat.c b/src/modules/_Stdio/stat.c
index 93c2c87e90..185af5c81f 100644
--- a/src/modules/_Stdio/stat.c
+++ b/src/modules/_Stdio/stat.c
@@ -928,7 +928,7 @@ void push_stat(PIKE_STAT_T *s)
/* ---------------------------------------------------------------- */
-void init_files_stat()
+void init_stdio_stat()
{
INT_TYPE n=0;
@@ -1013,7 +1013,7 @@ void init_files_stat()
add_program_constant("Stat",stat_program,0);
}
-void exit_files_stat()
+void exit_stdio_stat()
{
size_t i;
diff --git a/src/modules/_Stdio/udp.c b/src/modules/_Stdio/udp.c
index 8bfb2f3077..2c1b8e3c80 100644
--- a/src/modules/_Stdio/udp.c
+++ b/src/modules/_Stdio/udp.c
@@ -1231,7 +1231,7 @@ static void udp_set_buffer(INT32 args)
/*! @endmodule
*/
-void init_udp(void)
+void init_stdio_udp(void)
{
START_NEW_PROGRAM_ID (STDIO_UDP);
@@ -1358,5 +1358,8 @@ void init_udp(void)
f_call_function(1);
simple_add_constant("IPPROTO",Pike_sp-1,0);
pop_stack();
+}
+void exit_stdio_udp(void)
+{
}
diff --git a/src/program_id.h b/src/program_id.h
index 3ae15e5232..15e28f2fa4 100644
--- a/src/program_id.h
+++ b/src/program_id.h
@@ -109,7 +109,7 @@
/* Common modules. */
#define PROG_MODULE_MIME_ID 0100
-#define PROG_MODULE_FILES_ID 0101
+#define PROG_MODULE_STDIO_ID 0101
#define PROG_BASIC_TOKENIZER_ID 0110
#define PROG_TOKEN_ID 0111
--
GitLab