[SCM] Debian packaging of libfile-libmagic-perl branch, master, updated. d4f5b3f6f66400a05343f9578672c7ce7fb378d2
gregor herrmann
gregoa at debian.org
Thu Mar 1 22:59:26 UTC 2012
The following commit has been merged in the master branch:
commit e5b7ac24ab8fb61e7b2790a62339efe56ccc8a4e
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Mar 1 23:45:10 2012 +0100
debian/rules: remove override_dh_clean (svn era).
diff --git a/const-c.inc b/const-c.inc
deleted file mode 100644
index 3d163fd..0000000
--- a/const-c.inc
+++ /dev/null
@@ -1,211 +0,0 @@
-#define PERL_constant_NOTFOUND 1
-#define PERL_constant_NOTDEF 2
-#define PERL_constant_ISIV 3
-#define PERL_constant_ISNO 4
-#define PERL_constant_ISNV 5
-#define PERL_constant_ISPV 6
-#define PERL_constant_ISPVN 7
-#define PERL_constant_ISSV 8
-#define PERL_constant_ISUNDEF 9
-#define PERL_constant_ISUV 10
-#define PERL_constant_ISYES 11
-
-#ifndef NVTYPE
-typedef double NV; /* 5.6 and later define NVTYPE, and typedef NV to it. */
-#endif
-#ifndef aTHX_
-#define aTHX_ /* 5.6 or later define this for threading support. */
-#endif
-#ifndef pTHX_
-#define pTHX_ /* 5.6 or later define this for threading support. */
-#endif
-
-static int
-constant_11 (pTHX_ const char *name, IV *iv_return) {
- /* When generated this function returned values for the list of names given
- here. However, subsequent manual editing may have added or removed some.
- MAGIC_CHECK MAGIC_DEBUG MAGIC_ERROR */
- /* Offset 6 gives the best switch position. */
- switch (name[6]) {
- case 'C':
- if (memEQ(name, "MAGIC_CHECK", 11)) {
- /* ^ */
-#ifdef MAGIC_CHECK
- *iv_return = MAGIC_CHECK;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 'D':
- if (memEQ(name, "MAGIC_DEBUG", 11)) {
- /* ^ */
-#ifdef MAGIC_DEBUG
- *iv_return = MAGIC_DEBUG;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 'E':
- if (memEQ(name, "MAGIC_ERROR", 11)) {
- /* ^ */
-#ifdef MAGIC_ERROR
- *iv_return = MAGIC_ERROR;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- }
- return PERL_constant_NOTFOUND;
-}
-
-static int
-constant (pTHX_ const char *name, STRLEN len, IV *iv_return) {
- /* Initially switch on the length of the name. */
- /* When generated this function returned values for the list of names given
- in this section of perl code. Rather than manually editing these functions
- to add or remove constants, which would result in this comment and section
- of code becoming inaccurate, we recommend that you edit this section of
- code, and use it to regenerate a new set of constant functions which you
- then use to replace the originals.
-
- Regenerate these constant functions by feeding this entire source file to
- perl -x
-
-#!/usr/bin/perl5.8.8 -w
-use ExtUtils::Constant qw (constant_types C_constant XS_constant);
-
-my $types = {map {($_, 1)} qw(IV)};
-my @names = (qw(MAGIC_CHECK MAGIC_COMPRESS MAGIC_CONTINUE MAGIC_DEBUG
- MAGIC_DEVICES MAGIC_ERROR MAGIC_MIME MAGIC_NONE
- MAGIC_PRESERVE_ATIME MAGIC_RAW MAGIC_SYMLINK));
-
-print constant_types(); # macro defs
-foreach (C_constant ("File::LibMagic", 'constant', 'IV', $types, undef, 3, @names) ) {
- print $_, "\n"; # C constant subs
-}
-print "#### XS Section:\n";
-print XS_constant ("File::LibMagic", $types);
-__END__
- */
-
- switch (len) {
- case 9:
- if (memEQ(name, "MAGIC_RAW", 9)) {
-#ifdef MAGIC_RAW
- *iv_return = MAGIC_RAW;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 10:
- /* Names all of length 10. */
- /* MAGIC_MIME MAGIC_NONE */
- /* Offset 6 gives the best switch position. */
- switch (name[6]) {
- case 'M':
- if (memEQ(name, "MAGIC_MIME", 10)) {
- /* ^ */
-#ifdef MAGIC_MIME
- *iv_return = MAGIC_MIME;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 'N':
- if (memEQ(name, "MAGIC_NONE", 10)) {
- /* ^ */
-#ifdef MAGIC_NONE
- *iv_return = MAGIC_NONE;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- }
- break;
- case 11:
- return constant_11 (aTHX_ name, iv_return);
- break;
- case 13:
- /* Names all of length 13. */
- /* MAGIC_DEVICES MAGIC_SYMLINK */
- /* Offset 9 gives the best switch position. */
- switch (name[9]) {
- case 'I':
- if (memEQ(name, "MAGIC_DEVICES", 13)) {
- /* ^ */
-#ifdef MAGIC_DEVICES
- *iv_return = MAGIC_DEVICES;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 'L':
- if (memEQ(name, "MAGIC_SYMLINK", 13)) {
- /* ^ */
-#ifdef MAGIC_SYMLINK
- *iv_return = MAGIC_SYMLINK;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- }
- break;
- case 14:
- /* Names all of length 14. */
- /* MAGIC_COMPRESS MAGIC_CONTINUE */
- /* Offset 8 gives the best switch position. */
- switch (name[8]) {
- case 'M':
- if (memEQ(name, "MAGIC_COMPRESS", 14)) {
- /* ^ */
-#ifdef MAGIC_COMPRESS
- *iv_return = MAGIC_COMPRESS;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- case 'N':
- if (memEQ(name, "MAGIC_CONTINUE", 14)) {
- /* ^ */
-#ifdef MAGIC_CONTINUE
- *iv_return = MAGIC_CONTINUE;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- }
- break;
- case 20:
- if (memEQ(name, "MAGIC_PRESERVE_ATIME", 20)) {
-#ifdef MAGIC_PRESERVE_ATIME
- *iv_return = MAGIC_PRESERVE_ATIME;
- return PERL_constant_ISIV;
-#else
- return PERL_constant_NOTDEF;
-#endif
- }
- break;
- }
- return PERL_constant_NOTFOUND;
-}
-
diff --git a/const-xs.inc b/const-xs.inc
deleted file mode 100644
index f213f75..0000000
--- a/const-xs.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-void
-constant(sv)
- PREINIT:
-#ifdef dXSTARG
- dXSTARG; /* Faster if we have it. */
-#else
- dTARGET;
-#endif
- STRLEN len;
- int type;
- IV iv;
- /* NV nv; Uncomment this if you need to return NVs */
- /* const char *pv; Uncomment this if you need to return PVs */
- INPUT:
- SV * sv;
- const char * s = SvPV(sv, len);
- PPCODE:
- /* Change this to constant(aTHX_ s, len, &iv, &nv);
- if you need to return both NVs and IVs */
- type = constant(aTHX_ s, len, &iv);
- /* Return 1 or 2 items. First is error message, or undef if no error.
- Second, if present, is found value */
- switch (type) {
- case PERL_constant_NOTFOUND:
- sv = sv_2mortal(newSVpvf("%s is not a valid File::LibMagic macro", s));
- PUSHs(sv);
- break;
- case PERL_constant_NOTDEF:
- sv = sv_2mortal(newSVpvf(
- "Your vendor has not defined File::LibMagic macro %s, used", s));
- PUSHs(sv);
- break;
- case PERL_constant_ISIV:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHi(iv);
- break;
- /* Uncomment this if you need to return NOs
- case PERL_constant_ISNO:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHs(&PL_sv_no);
- break; */
- /* Uncomment this if you need to return NVs
- case PERL_constant_ISNV:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHn(nv);
- break; */
- /* Uncomment this if you need to return PVs
- case PERL_constant_ISPV:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHp(pv, strlen(pv));
- break; */
- /* Uncomment this if you need to return PVNs
- case PERL_constant_ISPVN:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHp(pv, iv);
- break; */
- /* Uncomment this if you need to return SVs
- case PERL_constant_ISSV:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHs(sv);
- break; */
- /* Uncomment this if you need to return UNDEFs
- case PERL_constant_ISUNDEF:
- break; */
- /* Uncomment this if you need to return UVs
- case PERL_constant_ISUV:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHu((UV)iv);
- break; */
- /* Uncomment this if you need to return YESs
- case PERL_constant_ISYES:
- EXTEND(SP, 1);
- PUSHs(&PL_sv_undef);
- PUSHs(&PL_sv_yes);
- break; */
- default:
- sv = sv_2mortal(newSVpvf(
- "Unexpected return type %d while processing File::LibMagic macro %s, used",
- type, s));
- PUSHs(sv);
- }
diff --git a/debian/rules b/debian/rules
index cadd91b..0692fed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,3 @@ TMP := $(CURDIR)/debian/$(PACKAGE)
override_dh_installexamples:
dh_installexamples
sed -i "s,^#! perl,#! /usr/bin/perl," $(TMP)/usr/share/doc/$(PACKAGE)/examples/*.pl
-
-override_dh_clean:
- dh_clean
- [ ! -x /usr/bin/svn -o ! -d .svn ] || svn revert const-xs.inc const-c.inc
--
Debian packaging of libfile-libmagic-perl
More information about the Pkg-perl-cvs-commits
mailing list