From c5d5fe98b24e7e9e34b06b88d5d9ae212ea74974 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 30 Apr 2008 13:53:40 +0000
Subject: [PATCH] Mark all functions that are only used within the file as
static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26607 b3059339-0415-0410-9bf9-f77b7e298cf2
---
TOOLS/asfinfo.c | 6 +++---
TOOLS/fastmemcpybench.c | 2 +-
TOOLS/modify_reg.c | 2 +-
TOOLS/movinfo.c | 12 ++++++------
TOOLS/netstream.c | 2 +-
TOOLS/subrip.c | 2 +-
TOOLS/vfw2menc.c | 6 +++---
TOOLS/vivodump.c | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/TOOLS/asfinfo.c b/TOOLS/asfinfo.c
index 89e332a4d8..b226dba906 100644
--- a/TOOLS/asfinfo.c
+++ b/TOOLS/asfinfo.c
@@ -89,7 +89,7 @@ unsigned char buffer[8192];
int i;
-char* chunk_type(unsigned char* guid){
+static char* chunk_type(unsigned char* guid){
switch(*((unsigned int*)guid)){
case 0xF8699E40: return "guid_audio_stream";
case 0xBC19EFC0: return "guid_video_stream";
@@ -105,7 +105,7 @@ char* chunk_type(unsigned char* guid){
return NULL;
}
-void print_wave_header(WAVEFORMATEX *h){
+static void print_wave_header(WAVEFORMATEX *h){
printf("======= WAVE Format =======\n");
@@ -135,7 +135,7 @@ void print_wave_header(WAVEFORMATEX *h){
}
-void print_video_header(BITMAPINFOHEADER *h){
+static void print_video_header(BITMAPINFOHEADER *h){
printf("======= VIDEO Format ======\n");
printf(" biSize %ld\n", h->biSize);
printf(" biWidth %ld\n", h->biWidth);
diff --git a/TOOLS/fastmemcpybench.c b/TOOLS/fastmemcpybench.c
index 37693c50e7..b4b2bb6ff9 100644
--- a/TOOLS/fastmemcpybench.c
+++ b/TOOLS/fastmemcpybench.c
@@ -74,7 +74,7 @@ static int mga_init(){
#endif
// Returns current time in microseconds
-unsigned int GetTimer(){
+static unsigned int GetTimer(){
struct timeval tv;
struct timezone tz;
// float s;
diff --git a/TOOLS/modify_reg.c b/TOOLS/modify_reg.c
index 47d802621c..6a05422b47 100644
--- a/TOOLS/modify_reg.c
+++ b/TOOLS/modify_reg.c
@@ -53,7 +53,7 @@ static void remove_key(long handle, const char* name) {
save_registry();
}
-void parse_key(char *raw, HKEY *root, char *path, char *key) {
+static void parse_key(char *raw, HKEY *root, char *path, char *key) {
char *tmpkey, *start;
tmpkey = strrchr(raw, '\\');
if (tmpkey == raw || tmpkey == NULL) {
diff --git a/TOOLS/movinfo.c b/TOOLS/movinfo.c
index 6e997b532b..7157573e37 100644
--- a/TOOLS/movinfo.c
+++ b/TOOLS/movinfo.c
@@ -22,7 +22,7 @@
#undef NO_SPECIAL
-char *atom2human_type(int type)
+static char *atom2human_type(int type)
{
switch (type)
{
@@ -57,13 +57,13 @@ int stream = S_NONE;
int v_stream = 0;
int a_stream = 0;
-unsigned int read_dword(FILE *f){
+static unsigned int read_dword(FILE *f){
unsigned char atom_size_b[4];
if(fread(&atom_size_b,4,1,f)<=0) return -1;
return (atom_size_b[0]<<24)|(atom_size_b[1]<<16)|(atom_size_b[2]<<8)|atom_size_b[3];
}
-void video_stream_info(FILE *f, int len)
+static void video_stream_info(FILE *f, int len)
{
int orig_pos = ftell(f);
unsigned char data[len-8];
@@ -79,7 +79,7 @@ void video_stream_info(FILE *f, int len)
fseek(f,orig_pos,SEEK_SET);
}
-void audio_stream_info(FILE *f, int len)
+static void audio_stream_info(FILE *f, int len)
{
int orig_pos = ftell(f);
unsigned char data[len-8];
@@ -98,7 +98,7 @@ void audio_stream_info(FILE *f, int len)
fseek(f,orig_pos,SEEK_SET);
}
-void userdata_info(FILE *f, int len, int pos, int level)
+static void userdata_info(FILE *f, int len, int pos, int level)
{
int orig_pos = pos; /*ftell(f);*/
unsigned int atom_size = 1;
@@ -153,7 +153,7 @@ void userdata_info(FILE *f, int len, int pos, int level)
int time_scale = 0;
-void lschunks(FILE *f,int level,unsigned int endpos){
+static void lschunks(FILE *f,int level,unsigned int endpos){
unsigned int atom_size;
unsigned int atom_type;
int pos;
diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c
index 7917811a93..a2b5bd3768 100644
--- a/TOOLS/netstream.c
+++ b/TOOLS/netstream.c
@@ -181,7 +181,7 @@ static int net_stream_close(client_t* cl) {
return 1;
}
-int handle_client(client_t* cl,mp_net_stream_packet_t* pack) {
+static int handle_client(client_t* cl,mp_net_stream_packet_t* pack) {
if(!pack)
return 0;
diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c
index 82a401a253..65d607fc4e 100644
--- a/TOOLS/subrip.c
+++ b/TOOLS/subrip.c
@@ -187,7 +187,7 @@ draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca
unlink(tmpfname);
}
-void
+static void
fast_memcpy(void *a, void *b, int s)
{ //FIXME
memcpy(a, b, s);
diff --git a/TOOLS/vfw2menc.c b/TOOLS/vfw2menc.c
index 91a2cde3ca..526acde3d3 100644
--- a/TOOLS/vfw2menc.c
+++ b/TOOLS/vfw2menc.c
@@ -59,7 +59,7 @@ enum
MODE_VIEW
};
-int save_settings(HDRVR hDriver, const char *filename)
+static int save_settings(HDRVR hDriver, const char *filename)
{
FILE *fd = NULL;
DWORD cb = (DWORD) SendDriverMessage(hDriver, ICM_GETSTATE, 0, 0);
@@ -99,7 +99,7 @@ int save_settings(HDRVR hDriver, const char *filename)
return 0;
}
-int load_settings(HDRVR hDriver, const char *filename)
+static int load_settings(HDRVR hDriver, const char *filename)
{
struct stat info;
FILE *fd = NULL;
@@ -150,7 +150,7 @@ static struct option long_options[] =
{ 0, 0, 0, 0 }
};
-void help(const char *progname)
+static void help(const char *progname)
{
printf("VFW to mencoder v"VERSION" - Copyright 2007 - Gianluigi Tiesi <sherpya@netfarm.it>\n");
printf("This program is Free Software\n\n");
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c
index bd6d3db3a1..e7df375b33 100644
--- a/TOOLS/vivodump.c
+++ b/TOOLS/vivodump.c
@@ -34,7 +34,7 @@ int bufptr=0;
int bitcnt=0;
unsigned char buf=0;
-unsigned int x_get_bits(int n){
+static unsigned int x_get_bits(int n){
unsigned int x=0;
while(n-->0){
if(!bitcnt){
@@ -59,7 +59,7 @@ int width=320;
int height=240;
/* most is hardcoded. should extend to handle all h263 streams */
-int h263_decode_picture_header(unsigned char *b_ptr)
+static int h263_decode_picture_header(unsigned char *b_ptr)
{
int i;