diff options
Diffstat (limited to 'src/libstrongswan/utils/optionsfrom.c')
| -rw-r--r-- | src/libstrongswan/utils/optionsfrom.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/libstrongswan/utils/optionsfrom.c b/src/libstrongswan/utils/optionsfrom.c index fe3d37966..e51780290 100644 --- a/src/libstrongswan/utils/optionsfrom.c +++ b/src/libstrongswan/utils/optionsfrom.c @@ -61,16 +61,8 @@ struct private_options_t { char *buffers[MAX_USES]; }; -<<<<<<< HEAD -/** - * Defined in header - */ -bool from(private_options_t *this, char *filename, int *argcp, char **argvp[], - int optind) -======= METHOD(options_t, from, bool, private_options_t *this, char *filename, int *argcp, char **argvp[], int optind) ->>>>>>> upstream/4.5.1 { int newargc; int next; /* place for next argument */ @@ -187,15 +179,8 @@ METHOD(options_t, from, bool, return good; } -<<<<<<< HEAD -/** - * Defined in header - */ -void destroy(private_options_t *this) -======= METHOD(options_t, destroy, void, private_options_t *this) ->>>>>>> upstream/4.5.1 { while (this->nuses >= 0) { @@ -210,19 +195,6 @@ METHOD(options_t, destroy, void, */ options_t *options_create(void) { -<<<<<<< HEAD - private_options_t *this = malloc_thing(private_options_t); - - /* initialize */ - this->newargv = NULL; - this->room = 0; - this->nuses = -1; - memset(this->buffers, '\0', MAX_USES); - - /* public functions */ - this->public.from = (bool (*) (options_t*,char*,int*,char***,int))from; - this->public.destroy = (void (*) (options_t*))destroy; -======= private_options_t *this; INIT(this, @@ -233,7 +205,6 @@ options_t *options_create(void) }, .nuses = -1, ); ->>>>>>> upstream/4.5.1 return &this->public; } |