Browse Source

on request

merge-experiment
Volker Birk 7 years ago
parent
commit
c41d9cbf92
5 changed files with 10 additions and 28 deletions
  1. +6
    -24
      src/data-types/syscall_wrappers.h
  2. +1
    -1
      src/driver/tools/generic_cache.c
  3. +1
    -1
      src/engine/mailprivacy_gnupg.c
  4. +1
    -1
      src/engine/mailprivacy_smime.c
  5. +1
    -1
      src/engine/mailprivacy_tools.c

+ 6
- 24
src/data-types/syscall_wrappers.h View File

@ -3,8 +3,12 @@
#include <errno.h>
#include <stdarg.h>
#ifdef EOF // stdio.h
#include <stdio.h>
#include <unistd.h>
#include <sys/select.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <sys/wait.h>
static inline FILE * Fopen(const char *filename, const char *mode)
{
@ -141,10 +145,6 @@ static inline int Fflush(FILE *stream)
}
#define fflush >@<
#endif // stdio.h
#ifdef F_OK // unistd.h
static inline int Mkstemp(char *template)
{
int fd;
@ -217,10 +217,6 @@ static inline int Dup2(int fildes, int fildes2)
}
#define dup2 >@<
#endif
#ifdef FD_CLR // select.h
static inline int Select(
int nfds,
fd_set *readfds,
@ -239,10 +235,6 @@ static inline int Select(
}
#define select >@<
#endif // select.h
#ifdef F_SETLKW // fcntl.h
static inline int Fcntl(int fildes, int cmd, void *structure)
{
int r;
@ -279,10 +271,6 @@ static inline int Creat(const char *path, mode_t mode)
}
#define creat >@<
#endif // fcntl.h
#ifdef MSG_PEEK // socket.h
static inline ssize_t Recv(int socket, void *buffer, size_t length, int flags)
{
ssize_t r;
@ -307,10 +295,6 @@ static inline ssize_t Send(int socket, const void *buffer, size_t length, int fl
}
#define send >@<
#endif // socket.h
#ifdef WNOHANG // wait.h
static inline pid_t Waitpid(pid_t pid, int *stat_loc, int options)
{
pid_t r;
@ -323,7 +307,5 @@ static inline pid_t Waitpid(pid_t pid, int *stat_loc, int options)
}
#define waitpid >@<
#endif
#endif // __SYSCALL_WRAPPERS_H__

+ 1
- 1
src/driver/tools/generic_cache.c View File

@ -64,7 +64,7 @@
#include "mailmessage.h"
#include "mail_cache_db.h"
#include "wrappers.h"
#include "syscall_wrappers.h"
int generic_cache_create_dir(char * dirname)
{


+ 1
- 1
src/engine/mailprivacy_gnupg.c View File

@ -72,7 +72,7 @@
#include <ctype.h>
#include <errno.h>
#include "../data-types/wrappers.h"
#include "../data-types/syscall_wrappers.h"
enum {
NO_ERROR_PGP = 0,


+ 1
- 1
src/engine/mailprivacy_smime.c View File

@ -67,7 +67,7 @@
#include <libetpan/libetpan-config.h>
#include <errno.h>
#include "../data-types/wrappers.h"
#include "../data-types/syscall_wrappers.h"
/*
global variable


+ 1
- 1
src/engine/mailprivacy_tools.c View File

@ -60,7 +60,7 @@
#include <libetpan/data_message_driver.h>
#include <errno.h>
#include "../data-types/wrappers.h"
#include "../data-types/syscall_wrappers.h"
void mailprivacy_mime_clear(struct mailmime * mime)
{


Loading…
Cancel
Save