aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/acme/file.c
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2017-10-16 16:22:44 +0200
committerPetter Rodhelind <petter.rodhelind@gmail.com>2017-10-16 16:22:44 +0200
commit785d7b84cb48fbf6bd033a5fda7f58762fb2e284 (patch)
treec2fcb789d0fbfe75e091b7cf53d793b0f27244db /src/cmd/acme/file.c
parentf19ec3797d11ebb3491c5b2b009ebca49b73f962 (diff)
parent7e6c008b73156b24ed7b59f6f076b4cda914ec86 (diff)
downloadplan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.tar.gz
plan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.tar.bz2
plan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/acme/file.c')
-rw-r--r--src/cmd/acme/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/acme/file.c b/src/cmd/acme/file.c
index 00d5d54c..e1eddc46 100644
--- a/src/cmd/acme/file.c
+++ b/src/cmd/acme/file.c
@@ -8,6 +8,7 @@
#include <frame.h>
#include <fcall.h>
#include <plumb.h>
+#include <libsec.h>
#include "dat.h"
#include "fns.h"
@@ -163,11 +164,11 @@ fileunsetname(File *f, Buffer *delta)
}
uint
-fileload(File *f, uint p0, int fd, int *nulls)
+fileload(File *f, uint p0, int fd, int *nulls, DigestState *h)
{
if(f->seq > 0)
error("undo in file.load unimplemented");
- return bufload(&f->b, p0, fd, nulls);
+ return bufload(&f->b, p0, fd, nulls, h);
}
/* return sequence number of pending redo */