From 00e01c3841eb1ab67ab4d358731740ae836c64b8 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 4 Jun 2013 07:20:01 -0400 Subject: src/libudev/path-util.c: bring in line with upstream Signed-off-by: Anthony G. Basile --- src/libudev/path-util.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'src/libudev/path-util.h') diff --git a/src/libudev/path-util.h b/src/libudev/path-util.h index e81821a28f..348157fc10 100644 --- a/src/libudev/path-util.h +++ b/src/libudev/path-util.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foopathutilhfoo -#define foopathutilhfoo +#pragma once /*** This file is part of systemd. @@ -22,24 +21,21 @@ along with systemd; If not, see . ***/ -#include "stdbool.h" +#include -bool is_path(const char *p); -char **path_split_and_make_absolute(const char *p); -char *path_get_file_name(const char *p); +bool is_path(const char *p) _pure_; +char** path_split_and_make_absolute(const char *p); +char* path_get_file_name(const char *p) _pure_; int path_get_parent(const char *path, char **parent); -bool path_is_absolute(const char *p); -char *path_make_absolute(const char *p, const char *prefix); -char *path_make_absolute_cwd(const char *p); -char *path_kill_slashes(char *path); -char *path_startswith(const char *path, const char *prefix); -bool path_equal(const char *a, const char *b); +bool path_is_absolute(const char *p) _pure_; +char* path_make_absolute(const char *p, const char *prefix); +char* path_make_absolute_cwd(const char *p); +char* path_kill_slashes(char *path); +char* path_startswith(const char *path, const char *prefix) _pure_; +bool path_equal(const char *a, const char *b) _pure_; -char **path_strv_make_absolute_cwd(char **l); -char **path_strv_canonicalize(char **l); -char **path_strv_remove_empty(char **l); +char** path_strv_make_absolute_cwd(char **l); +char** path_strv_canonicalize(char **l); int path_is_mount_point(const char *path, bool allow_symlink); int path_is_read_only_fs(const char *path); - -#endif -- cgit v1.2.3-54-g00ecf