[med-svn] [r-cran-filehash] 05/07: New upstream version 2.4-1
Andreas Tille
tille at debian.org
Tue Oct 10 10:14:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-filehash.
commit c5b2d53a60f5a98e0feff9797891999a8e480dea
Author: Andreas Tille <tille at debian.org>
Date: Tue Oct 10 12:10:20 2017 +0200
New upstream version 2.4-1
---
DESCRIPTION | 7 +++----
MD5 | 19 ++++++++++---------
NAMESPACE | 2 +-
R/filehash-DB1.R | 6 +++---
R/hash.R | 4 ++--
R/zzz.R | 4 ++--
build/vignette.rds | Bin 209 -> 209 bytes
inst/CITATION | 2 +-
inst/doc/filehash.pdf | Bin 100431 -> 100429 bytes
man/dbInit.Rd | 4 ----
src/init.c | 24 ++++++++++++++++++++++++
11 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 264febc..3af12d2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,5 @@
Package: filehash
-Date: 2015-08-12
-Version: 2.3
+Version: 2.4-1
Depends: R (>= 3.0.0), methods
Collate: filehash.R filehash-DB1.R filehash-RDS.R coerce.R dump.R
hash.R queue.R stack.R zzz.R
@@ -16,7 +15,7 @@ Description: Implements a simple key-value style database where character string
'filehash' framework.
License: GPL (>= 2)
URL: http://github.com/rdpeng/filehash
-Packaged: 2015-08-12 14:57:00 UTC; rdpeng
NeedsCompilation: yes
+Packaged: 2017-04-07 16:56:42 UTC; rdpeng
Repository: CRAN
-Date/Publication: 2015-08-16 07:30:57
+Date/Publication: 2017-04-07 17:39:18 UTC
diff --git a/MD5 b/MD5
index 1fd5c05..d142544 100644
--- a/MD5
+++ b/MD5
@@ -1,25 +1,25 @@
-a50b1c1bdc0c3c65e36b52d5b85b364a *DESCRIPTION
-369879e4ab19e6934e6136e2f5a86f9f *NAMESPACE
+f81a68a5ced9bc1be6ec8ecfaa284a8d *DESCRIPTION
+010f9467e36e0921ea402278070cbe7b *NAMESPACE
45232e1ac4dac258e45556bd5f43123c *R/coerce.R
90f64221f6f44767deed77323c0d4db2 *R/dump.R
-d20b08ebd20413d3c82045b78e07d662 *R/filehash-DB1.R
+a8bd746b0bb1edddfacb7e4a5c83f1ef *R/filehash-DB1.R
792728111ce93475ae36b03871c7fb51 *R/filehash-RDS.R
b0769cf1a3599dced35d14ce286a651c *R/filehash.R
-23024206925dc990b4acd2f5f14d18b4 *R/hash.R
+9aafffd8d97e0765c852ea081f3b0b81 *R/hash.R
b096fd971b2464562c885b8f6d3caeab *R/queue.R
a75a45aef48fc227a52cc6144180eed0 *R/stack.R
-5d89ecc5246dec2fa4b5b6550d00c1bc *R/zzz.R
-aface47053e12f9628bb70a828a1ad75 *build/vignette.rds
-ed14a5c660ea0f0e723a406175038eb7 *inst/CITATION
+017227163eed2f4e14226ad119129c81 *R/zzz.R
+5d965e25cfd7c6d486dbe4c31debbaa2 *build/vignette.rds
+7e77175e004788ca21e49f63b303381a *inst/CITATION
b128d2038f8d0c5c554b72de80298e4a *inst/COPYING
44422cadef3c067ffd43b9f00a18aa9d *inst/NEWS
6b5ee8f3a31a761dd38bd0238efbdfc1 *inst/doc/filehash.R
7fb6c57e7c3a9b572359b21e60e07d3f *inst/doc/filehash.Rnw
-425c7ead37800f5dcfc3af75c2d7f43d *inst/doc/filehash.pdf
+616e47c0154f01ee4bc9611485c6abb1 *inst/doc/filehash.pdf
196634a9bcac54d5a8c2f30c622caf8d *man/createQ.Rd
76d0e8fb13ec5e82d2db2fe69c153399 *man/createS.Rd
994907132b6735cd18cb2e58fbe38246 *man/db2env.Rd
-666fa5e79d7b3eef0600c59653613c1c *man/dbInit.Rd
+b58d9742e3fb9a199ea91a8486ee7e9b *man/dbInit.Rd
7540db5f93596a70ed9a552bda857059 *man/dump.Rd
fd3538ab1ab32963e4450a394c1970e6 *man/filehash-class.Rd
45f7f3a21e0d0cb2afbed678f4cf1e44 *man/filehashFormats.Rd
@@ -28,6 +28,7 @@ fe2418282768cb27bdcef448742c263e *man/filehashOption.Rd
3206913d23a67ae002e0214ee2093e94 *man/queue-class.Rd
d6937904dedc8cd4e083e1b941d78b70 *man/stack-class.Rd
e3ae87905dbded19881cffd6c80a8be4 *src/hash.c
+aabbbc8b771fb3caf53a314f8ae37a1f *src/init.c
1f69eebc69b381da6e96c802a8c93003 *src/lockfile.c
8a9e91209bf674c2db625d29298caad2 *src/readKeyMap.c
2212ffe253fda0b122c209ae4e220c71 *src/sha1.c
diff --git a/NAMESPACE b/NAMESPACE
index 7b05eca..9f0f99a 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,4 +1,4 @@
-useDynLib(filehash)
+useDynLib(filehash, .registration = TRUE, .fixes = "C_")
import(methods)
## Classes
diff --git a/R/filehash-DB1.R b/R/filehash-DB1.R
index b516127..07c7896 100644
--- a/R/filehash-DB1.R
+++ b/R/filehash-DB1.R
@@ -108,7 +108,7 @@ readKeyMap <- function(con, map = NULL, pos = 0) {
if(pos > filesize)
stop("'pos' cannot be greater than file size")
- .Call("read_key_map", filename, map, filesize, pos)
+ .Call(C_read_key_map, filename, map, filesize, pos)
}
readSingleKey <- function(con, map, key) {
@@ -184,7 +184,7 @@ setMethod("lockFile", "file", function(db, ...) {
createLockFile <- function(name) {
if(.Platform$OS.type != "windows")
- status <- .Call("lock_file", name)
+ status <- .Call(C_lock_file, name)
else {
## TODO: are these optimal values for max.attempts
## and sleep.duration?
@@ -194,7 +194,7 @@ createLockFile <- function(name) {
status <- -1
while ((attempts <= max.attempts) && ! isTRUE(status >= 0)) {
attempts <- attempts + 1
- status <- .Call("lock_file", name)
+ status <- .Call(C_lock_file, name)
if(!isTRUE(status >= 0))
Sys.sleep(sleep.duration)
diff --git a/R/hash.R b/R/hash.R
index 7fb8ab2..1774b9d 100644
--- a/R/hash.R
+++ b/R/hash.R
@@ -2,9 +2,9 @@ sha1 <- function(object, skip = 14L) {
## Setting 'skip = 14' gives us the same results as
## 'digest(object, "sha1")'
bytes <- serialize(object, NULL)
- .Call("sha1_object", bytes, skip)
+ .Call(C_sha1_object, bytes, skip)
}
sha1_file <- function(filename, skip = 0L) {
- .Call("sha1_file", filename, skip)
+ .Call(C_sha1_file, filename, skip)
}
diff --git a/R/zzz.R b/R/zzz.R
index 2ed8cd1..720240e 100644
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -12,8 +12,8 @@
.onAttach <- function(lib, pkg) {
dcf <- read.dcf(file.path(lib, pkg, "DESCRIPTION"))
- msg <- gettextf("%s: %s (%s %s)", dcf[, "Package"], dcf[, "Title"],
- as.character(dcf[, "Version"]), dcf[, "Date"])
+ msg <- gettextf("%s: %s (%s)", dcf[, "Package"], dcf[, "Title"],
+ as.character(dcf[, "Version"]))
packageStartupMessage(paste(strwrap(msg), collapse = "\n"))
}
diff --git a/build/vignette.rds b/build/vignette.rds
index 0f52621..6cc0140 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/inst/CITATION b/inst/CITATION
index a38a6f5..6e98477 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -8,7 +8,7 @@ citEntry(entry = "article",
volume = "6",
number = "4",
pages = "19--24",
- url = "http://CRAN.R-project.org/doc/Rnews/",
+ url = "https://cran.r-project.org/doc/Rnews/",
textVersion = paste("Peng RD (2006).", dQuote("Interacting with data using the filehash package,"), "R News, 6 (4), 19--24.")
)
diff --git a/inst/doc/filehash.pdf b/inst/doc/filehash.pdf
index 952abff..4ea7a7e 100644
Binary files a/inst/doc/filehash.pdf and b/inst/doc/filehash.pdf differ
diff --git a/man/dbInit.Rd b/man/dbInit.Rd
index b56eda0..d556b34 100644
--- a/man/dbInit.Rd
+++ b/man/dbInit.Rd
@@ -4,8 +4,6 @@
\alias{dbCreate}
\alias{dbCreate,ANY-method}
\alias{dbInit,ANY-method}
-\alias{dbReconnect}
-\alias{dbReconnect,filehashDB1-method}
%\alias{dbInitialize}
@@ -16,11 +14,9 @@
\usage{
dbCreate(db, ...)
dbInit(db, ...)
-dbReconnect(db, ...)
\S4method{dbCreate}{ANY}(db, type = NULL, ...)
\S4method{dbInit}{ANY}(db, type = NULL, ...)
-\S4method{dbReconnect}{filehashDB1}(db, ...)
}
\arguments{
diff --git a/src/init.c b/src/init.c
new file mode 100644
index 0000000..a52cb6c
--- /dev/null
+++ b/src/init.c
@@ -0,0 +1,24 @@
+#include <stdlib.h> // for NULL
+#include <R_ext/Rdynload.h>
+#include <Rinternals.h>
+
+SEXP sha1_object(SEXP object, SEXP skip_bytes);
+SEXP sha1_file(SEXP filename, SEXP skip_bytes);
+SEXP read_key_map(SEXP filename, SEXP map, SEXP filesize, SEXP pos);
+SEXP lock_file(SEXP filename);
+
+static const R_CallMethodDef CallEntries[] = {
+ {"lock_file", (DL_FUNC) &lock_file, 1},
+ {"read_key_map", (DL_FUNC) &read_key_map, 4},
+ {"sha1_object", (DL_FUNC) &sha1_object, 2},
+ {"sha1_file", (DL_FUNC) &sha1_file, 2},
+ {NULL, NULL, 0}
+};
+
+void R_init_filehash(DllInfo *info)
+{
+ R_registerRoutines(info, NULL, CallEntries, NULL, NULL);
+ R_useDynamicSymbols(info, FALSE);
+ R_forceSymbols(info, TRUE);
+
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-filehash.git
More information about the debian-med-commit
mailing list