aboutsummaryrefslogtreecommitdiff
path: root/libfshelp/fshelp.h
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
commit13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch)
tree1e1463b03838a6f36868a4dafc7e652358a51857 /libfshelp/fshelp.h
parent1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff)
parent7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff)
downloadhurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.gz
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.bz2
hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.zip
Merge branch 'master' into xkb
Conflicts: config.make.in configure.in
Diffstat (limited to 'libfshelp/fshelp.h')
-rw-r--r--libfshelp/fshelp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libfshelp/fshelp.h b/libfshelp/fshelp.h
index 5c43c54c..9f4fa677 100644
--- a/libfshelp/fshelp.h
+++ b/libfshelp/fshelp.h
@@ -38,7 +38,7 @@
or the ports library. */
/* A callback used by the translator starting functions, which should be a
- function that given some open flags, opens the appropiate file, and
+ function that given some open flags, opens the appropriate file, and
returns the node port. */
typedef error_t (*fshelp_open_fn_t) (int flags,
file_t *node,
@@ -253,7 +253,7 @@ error_t fshelp_access (io_statbuf_t *st, int op, struct iouser *user);
/* Check to see whether USER is allowed to modify DIR with respect to
existing file ST. (If there is no existing file, pass 0 for ST.)
- If the access is permissable return 0; otherwise return an
+ If the access is permissible return 0; otherwise return an
appropriate error code. */
error_t fshelp_checkdirmod (io_statbuf_t *dir, io_statbuf_t *st,
struct iouser *user);