aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-14 19:02:48 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-14 19:02:48 +0000
commitd9f31b1c477df5080d8496babb4476565c073b53 (patch)
treeaa1f687fdbb828e14b484783c0d63f030f97994e
parente39289a9878864a48e7b877fd49b56a76c43f1e8 (diff)
downloadmpd-d9f31b1c477df5080d8496babb4476565c073b53.tar.gz
mpd-d9f31b1c477df5080d8496babb4476565c073b53.tar.xz
mpd-d9f31b1c477df5080d8496babb4476565c073b53.zip
[CLEANUP] Remove 'extern int errno;'
Remove unexported functions from the header Static what makes sense git-svn-id: https://svn.musicpd.org/mpd/trunk@4326 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/ls.c22
-rw-r--r--src/ls.h4
2 files changed, 3 insertions, 23 deletions
diff --git a/src/ls.c b/src/ls.c
index 35b370546..aea510afd 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -23,25 +23,9 @@
#include "log.h"
#include "utf8.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
#include <dirent.h>
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include <errno.h>
-extern int errno;
-
-char * dupAndStripPlaylistSuffix(char * file) {
- size_t size = strlen(file)-strlen(PLAYLIST_FILE_SUFFIX)-1;
- char * ret = malloc(size+1);
-
- strncpy(ret,file,size);
- ret[size] = '\0';
-
- return ret;
-}
static char * remoteUrlPrefixes[] =
{
@@ -202,7 +186,7 @@ int myStat(char * utf8file, struct stat * st) {
return stat(actualFile,st);
}
-int isFile(char * utf8file, time_t * mtime) {
+static int isFile(char * utf8file, time_t * mtime) {
struct stat st;
if(myStat(utf8file,&st)==0) {
@@ -226,7 +210,7 @@ int isFile(char * utf8file, time_t * mtime) {
/* suffixes should be ascii only characters */
char * getSuffix(char * utf8file) {
char * ret = NULL;
-
+
while(*utf8file) {
if(*utf8file == '.') ret = utf8file+1;
utf8file++;
@@ -262,7 +246,7 @@ int isDir(char * utf8name) {
InputPlugin * hasMusicSuffix(char * utf8file, unsigned int next) {
InputPlugin * ret = NULL;
-
+
char * s = getSuffix(utf8file);
if(s) {
ret = getInputPluginFromSuffix(s, next);
diff --git a/src/ls.h b/src/ls.h
index b31fb2cd8..93bd9807f 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -39,8 +39,6 @@ int isRemoteUrl(char * url);
int myStat(char * utf8file, struct stat * st);
-int isFile(char * utf8file, time_t * mtime);
-
int isDir(char * utf8name);
int isPlaylist(char * utf8file);
@@ -49,8 +47,6 @@ InputPlugin * hasMusicSuffix(char * utf8file, unsigned int next);
InputPlugin * isMusic(char * utf8file, time_t * mtime, unsigned int next);
-char * dupAndStripPlaylistSuffix(char * file);
-
int printRemoteUrlHandlers(FILE * fp);
#endif