diff options
| author | Kjetil Ørbekk <orbekk@pvv.ntnu.no> | 2008-05-04 12:07:44 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <orbekk@pvv.ntnu.no> | 2008-05-04 12:07:44 +0200 |
| commit | 76fdfd180cd2c9cca370b12178aaa72ab54bfade (patch) | |
| tree | f22ebfa81d82cfc5a019d23f6ebf30a28c885851 /src | |
| parent | c881ab427c8de1bf906797b64434263ddd4653c4 (diff) | |
- Removed some BSD specific stuff etc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mp3_subr.c | 4 | ||||
| -rwxr-xr-x | src/mp3_vnops.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/mp3_subr.c b/src/mp3_subr.c index 3c5798c..dd8e68d 100644 --- a/src/mp3_subr.c +++ b/src/mp3_subr.c @@ -16,8 +16,6 @@ #include <mnode.h> #include <queue.h> #include <debug.h> -#include <log.h> - struct queryvector { char *artist; @@ -136,7 +134,7 @@ mp3_filter(struct collection *selection, int filter, struct filler_data *fd) if (field == NULL || !strcmp(field, "")) continue; /* XXX: check if we need to free this or not. */ - strlcpy(name, field, sizeof(name)); + strncpy(name, field, sizeof(name)); fd->filler(fd->buf, name, NULL, 0); } } diff --git a/src/mp3_vnops.c b/src/mp3_vnops.c index 39ad651..e1da22b 100755 --- a/src/mp3_vnops.c +++ b/src/mp3_vnops.c @@ -14,7 +14,6 @@ #include <tag_c.h> #include <mp3fs.h> #include <debug.h> -#include <log.h> char musicpath[MAXPATHLEN]; // = "/home/lulf/dev/mp3fs/music"; char *logpath = "/home/lulf/dev/mp3fs/mp3fs.log"; @@ -154,10 +153,8 @@ mp3_run(int argc, char **argv) exit (1); DEBUG("musicpath: %s\n", musicpath); - log_open(logpath); mp3_initscan(musicpath); ret = fuse_main(args.argc, args.argv, &mp3_ops, NULL); - log_close(); return (ret); } |