diff options
| author | Karel Zak | 2012-06-15 12:44:17 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-06-15 12:44:17 +0200 |
| commit | d5f9b6e5fb352c632655e442773df96129cea02d (patch) | |
| tree | a260ed26fd77e54280d1370f0b8e7a41aa1fe380 /libmount | |
| parent | libmount: make some string operations more robust (diff) | |
| parent | lsblk: use blkdev_scsi_type_to_name() (diff) | |
| download | kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.tar.gz kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.tar.xz kernel-qcow2-util-linux-d5f9b6e5fb352c632655e442773df96129cea02d.zip | |
Merge branch '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit
* '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit:
lsblk: use blkdev_scsi_type_to_name()
blkdev: add blkdev_scsi_type_to_name()
wipefs: use symbolic value for markup mode
eject: inform if CD-ROM drive is not ready
docs: clean up partx.8 manual
include: fix void pointer arithmetics warnings
sysfs: fix printf format warnings
build: fix unused parameter warnings
build: fix redundant redeclaration warnings
include: fix spurious list.h warnings
uuidd: use output redirection which works [checkbashisms]
blkid: fix realloc memory leak [cppcheck]
setarch: do not use -1 as array index [cppcheck]
Diffstat (limited to 'libmount')
| -rw-r--r-- | libmount/src/mountP.h | 2 | ||||
| -rw-r--r-- | libmount/src/optstr.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h index c7d378eeb..f7cd7d53d 100644 --- a/libmount/src/mountP.h +++ b/libmount/src/mountP.h @@ -380,7 +380,6 @@ extern int mnt_context_guess_fstype(struct libmnt_context *cxt); extern int mnt_context_prepare_helper(struct libmnt_context *cxt, const char *name, const char *type); extern int mnt_context_prepare_update(struct libmnt_context *cxt); -extern struct libmnt_fs *mnt_context_get_fs(struct libmnt_context *cxt); extern int mnt_context_merge_mflags(struct libmnt_context *cxt); extern int mnt_context_update_tabs(struct libmnt_context *cxt); @@ -395,7 +394,6 @@ extern int mnt_context_clear_loopdev(struct libmnt_context *cxt); extern int mnt_fork_context(struct libmnt_context *cxt); /* tab_update.c */ -extern struct libmnt_fs *mnt_update_get_fs(struct libmnt_update *upd); extern int mnt_update_set_filename(struct libmnt_update *upd, const char *filename, int userspace_only); diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c index bf9f8b71f..cc1bef84f 100644 --- a/libmount/src/optstr.c +++ b/libmount/src/optstr.c @@ -774,7 +774,10 @@ err: * * Returns: 0 on success, negative number in case of error. */ -int mnt_optstr_fix_secontext(char **optstr, char *value, size_t valsz, char **next) +int mnt_optstr_fix_secontext(char **optstr __attribute__ ((__unused__)), + char *value __attribute__ ((__unused__)), + size_t valsz __attribute__ ((__unused__)), + char **next __attribute__ ((__unused__))) { int rc = 0; |