rpmperl.c | rpmperl.c | |||
---|---|---|---|---|
skipping to change at line 30 | skipping to change at line 30 | |||
/*@unchecked@*/ /*@relnull@*/ | /*@unchecked@*/ /*@relnull@*/ | |||
rpmperl _rpmperlI = NULL; | rpmperl _rpmperlI = NULL; | |||
#define my_perl ((PerlInterpreter *)perl->I) | #define my_perl ((PerlInterpreter *)perl->I) | |||
static void rpmperlFini(void * _perl) | static void rpmperlFini(void * _perl) | |||
/*@globals fileSystem @*/ | /*@globals fileSystem @*/ | |||
/*@modifies *_perl, fileSystem @*/ | /*@modifies *_perl, fileSystem @*/ | |||
{ | { | |||
rpmperl perl = _perl; | rpmperl perl = (rpmperl) _perl; | |||
#if defined(WITH_PERLEMBED) | #if defined(WITH_PERLEMBED) | |||
PERL_SET_CONTEXT(my_perl); | PERL_SET_CONTEXT(my_perl); | |||
PL_perl_destruct_level = 1; | PL_perl_destruct_level = 1; | |||
perl_destruct(my_perl); | perl_destruct(my_perl); | |||
perl_free(my_perl); | perl_free(my_perl); | |||
if (perl == _rpmperlI) /* XXX necessary on HP-UX? */ | if (perl == _rpmperlI) /* XXX necessary on HP-UX? */ | |||
PERL_SYS_TERM(); | PERL_SYS_TERM(); | |||
#endif | #endif | |||
perl->I = NULL; | perl->I = NULL; | |||
skipping to change at line 68 | skipping to change at line 68 | |||
} | } | |||
#if defined(WITH_PERLEMBED) | #if defined(WITH_PERLEMBED) | |||
EXTERN_C void xs_init (PerlInterpreter * _my_perl PERL_UNUSED_DECL); | EXTERN_C void xs_init (PerlInterpreter * _my_perl PERL_UNUSED_DECL); | |||
EXTERN_C void boot_DynaLoader (PerlInterpreter* _my_perl, CV* cv); | EXTERN_C void boot_DynaLoader (PerlInterpreter* _my_perl, CV* cv); | |||
EXTERN_C void | EXTERN_C void | |||
xs_init(PerlInterpreter* _my_perl PERL_UNUSED_DECL) | xs_init(PerlInterpreter* _my_perl PERL_UNUSED_DECL) | |||
{ | { | |||
char *file = __FILE__; | char * file = (char *) __FILE__; | |||
dXSUB_SYS; | dXSUB_SYS; | |||
/* DynaLoader is a special case */ | /* DynaLoader is a special case */ | |||
Perl_newXS(_my_perl, "DynaLoader::boot_DynaLoader", boot_DynaLoader, file); | Perl_newXS(_my_perl, "DynaLoader::boot_DynaLoader", boot_DynaLoader, file); | |||
} | } | |||
/*@unchecked@*/ | /*@unchecked@*/ | |||
static const char * _rpmperlI_init = "\ | static const char * _rpmperlI_init = "\ | |||
use strict;\n\ | use strict;\n\ | |||
use IO::String;\n\ | use IO::String;\n\ | |||
skipping to change at line 101 | skipping to change at line 101 | |||
} | } | |||
rpmperl rpmperlNew(char ** av, uint32_t flags) | rpmperl rpmperlNew(char ** av, uint32_t flags) | |||
{ | { | |||
rpmperl perl = | rpmperl perl = | |||
#ifdef NOTYET | #ifdef NOTYET | |||
(flags & 0x80000000) ? rpmperlI() : | (flags & 0x80000000) ? rpmperlI() : | |||
#endif | #endif | |||
rpmperlGetPool(_rpmperlPool); | rpmperlGetPool(_rpmperlPool); | |||
#if defined(WITH_PERLEMBED) | #if defined(WITH_PERLEMBED) | |||
static char * _av[] = { "rpmperl", NULL }; | static const char * _av[] = { "rpmperl", NULL }; | |||
static int initialized = 0; | static int initialized = 0; | |||
ARGV_t argv = NULL; | ARGV_t argv = NULL; | |||
int argc = 0; | int argc = 0; | |||
int xx; | int xx; | |||
if (av == NULL) av = _av; | if (av == NULL) av = (char **) _av; | |||
/* Build argv(argc) for the interpreter. */ | /* Build argv(argc) for the interpreter. */ | |||
xx = argvAdd(&argv, av[0]); | xx = argvAdd(&argv, av[0]); | |||
{ static const char _perlI_init[] = "%{?_perlI_init}"; | { static const char _perlI_init[] = "%{?_perlI_init}"; | |||
const char * s = rpmExpand(_rpmperlI_init, _perlI_init, NULL); | const char * s = rpmExpand(_rpmperlI_init, _perlI_init, NULL); | |||
if (s && *s) { | if (s && *s) { | |||
xx = argvAdd(&argv, "-e"); | xx = argvAdd(&argv, "-e"); | |||
xx = argvAdd(&argv, s); | xx = argvAdd(&argv, s); | |||
} | } | |||
s = _free(s); | s = _free(s); | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |