From 9ffb0038ded686a177b06f268f08c9bcd48128b2 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 30 Nov 2015 13:59:05 +0100 Subject: [FUSE] Compiles again --- src/fuse/helper.c | 10 ---------- src/fuse/helper.h | 2 -- src/fuse/log.h | 43 ------------------------------------------- 3 files changed, 55 deletions(-) delete mode 100644 src/fuse/log.h (limited to 'src/fuse') diff --git a/src/fuse/helper.c b/src/fuse/helper.c index 6e46352..853b021 100644 --- a/src/fuse/helper.c +++ b/src/fuse/helper.c @@ -37,13 +37,3 @@ void printLog( log_info *info ) fprintf( logFile, "\n" ); fclose( logFile ); } - -bool sock_printable( struct sockaddr *addr, socklen_t addrLen, char *output, int len ) -{ - char host[100], port[10]; - int ret = getnameinfo( addr, addrLen, host, 100, port, 10, NI_NUMERICHOST | NI_NUMERICSERV ); - if ( ret == 0 ) { - snprintf( output, len, "[%s]:%s", host, port ); - } - return ret == 0; -} diff --git a/src/fuse/helper.h b/src/fuse/helper.h index 35cdc8a..0b98ded 100644 --- a/src/fuse/helper.h +++ b/src/fuse/helper.h @@ -20,8 +20,6 @@ typedef struct log_info { void printLog(log_info *info); -bool sock_printable(struct sockaddr *addr, socklen_t addrLen, char *output, int len); - int connect_to_server(char *server_adress, int port); static inline bool isSameAddressPort(const dnbd3_host_t * const a, const dnbd3_host_t * const b) diff --git a/src/fuse/log.h b/src/fuse/log.h deleted file mode 100644 index e429861..0000000 --- a/src/fuse/log.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef LOG_H_ -#define LOG_H_ - -#include -#include -#include - -typedef unsigned int logmask_t; -#define LOG_ERROR ((logmask_t)1) // Fatal error, server will terminate -#define LOG_WARNING ((logmask_t)2) // Major issue, something is broken but keep running -#define LOG_MINOR ((logmask_t)4) // Minor issue, more of a hickup than serious problem -#define LOG_INFO ((logmask_t)8) // Informational message -#define LOG_DEBUG1 ((logmask_t)16) // Debug information, use this for non-spammy stuff -#define LOG_DEBUG2 ((logmask_t)32) // Use this for debug messages that will show up a lot - -//void log_setFileMask(logmask_t mask); - -//void log_setConsoleMask(logmask_t mask); - -/** - * Open or reopen the log file. If path is NULL and the - * function was called with a path before, the same path - * will be used again. - */ -//bool log_openLogFile(const char *path); - -/** - * Add a line to the log - */ -void logadd(const logmask_t mask, const char *text, ...) -{ - va_list args; - va_start( args, text ); - vprintf( text, args ); - va_end( args ); -} - -/** - * Return last size bytes of log. - */ -//bool log_fetch(char *buffer, int size); - -#endif /* LOG_H_ */ -- cgit v1.2.3-55-g7522