aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-11-26 17:57:57 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-11-26 17:57:57 +0000
commitc2e534455ee76daab01181c130e6ce43cfb03cfa (patch)
treee47069364e6330020946012d92b857e56b8af5a5
parent53efae4cb12cbbe93b663b48c59ef840d8dff258 (diff)
downloadrpmdrake-c2e534455ee76daab01181c130e6ce43cfb03cfa.tar
rpmdrake-c2e534455ee76daab01181c130e6ce43cfb03cfa.tar.gz
rpmdrake-c2e534455ee76daab01181c130e6ce43cfb03cfa.tar.bz2
rpmdrake-c2e534455ee76daab01181c130e6ce43cfb03cfa.tar.xz
rpmdrake-c2e534455ee76daab01181c130e6ce43cfb03cfa.zip
minor changes
-rw-r--r--grpmi/rpm/grpmi_rpm.xs6
1 files changed, 3 insertions, 3 deletions
diff --git a/grpmi/rpm/grpmi_rpm.xs b/grpmi/rpm/grpmi_rpm.xs
index c2c7a923..f63cdca2 100644
--- a/grpmi/rpm/grpmi_rpm.xs
+++ b/grpmi/rpm/grpmi_rpm.xs
@@ -178,7 +178,7 @@ int install_packages_callback(char * msg, ...)
out = "";
va_end(args);
- if (!install_packages_callback_data)
+ if (!SvROK(install_packages_callback_data))
return 0;
ENTER;
SAVETMPS;
@@ -186,7 +186,7 @@ int install_packages_callback(char * msg, ...)
XPUSHs(sv_2mortal(newSVpv(out, 0)));
PUTBACK;
free(out);
- i = perl_call_sv(install_packages_callback_data, G_SCALAR);
+ i = call_sv(install_packages_callback_data, G_SCALAR);
SPAGAIN;
if (i != 1)
croak("Big trouble\n");
@@ -369,7 +369,7 @@ SV * callback
install_packages_callback_data = callback;
pkgs = malloc(sizeof(char *) * items);
for (i=1; i<items; i++)
- pkgs[i-1] = SvPV(ST(i), PL_na);
+ pkgs[i-1] = SvPV_nolen(ST(i));
pkgs[items-1] = NULL;
RETVAL = install_packages_(pkgs);
free(pkgs);