summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am5
-rw-r--r--src/find-mount-point.c4
-rw-r--r--src/find-mount-point.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bf1d60a88..5bd71d258 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -727,7 +727,8 @@ sc_tight_scope: $(bin_PROGRAMS)
( printf 'main\nusage\n_.*\n'; \
grep -h -A1 '^extern .*[^;]$$' $$src \
| grep -vE '^(extern |--)' | sed 's/ .*//'; \
- perl -ne '/^extern (?:enum )?\S+ (\S*) \(/ and print "$$1\n"' $$hdr; \
+ perl -lne '/^extern (?:enum )?\S+ \**(\S*) \(/ and print $$1' \
+ $$hdr; \
) | $(ASSORT) -u | sed 's/^/^/;s/$$/$$/' > $$t; \
nm -e *.$(OBJEXT) \
| sed -n 's/.* T //p' \
@@ -736,7 +737,7 @@ sc_tight_scope: $(bin_PROGRAMS)
{ echo 'the above functions should have static scope' 1>&2; \
exit 1; } || : ; \
( printf '^program_name$$\n'; \
- perl -ne '/^extern .*?\**(\w+);/ and print "^$$1\$$\n"' \
+ perl -lne '/^extern .*?\**(\w+);/ and print "^$$1\$$"' \
$$hdr *.h ) | $(ASSORT) -u > $$t; \
nm -e *.$(OBJEXT) \
| sed -n 's/.* [BD] //p' \
diff --git a/src/find-mount-point.c b/src/find-mount-point.c
index 48dc42304..30e51227c 100644
--- a/src/find-mount-point.c
+++ b/src/find-mount-point.c
@@ -29,11 +29,11 @@
Give a diagnostic and return NULL if unable to determine the mount point.
Exit if unable to restore current working directory. */
extern char *
-find_mount_point (const char *file, const struct stat *file_stat)
+find_mount_point (char const *file, struct stat const *file_stat)
{
struct saved_cwd cwd;
struct stat last_stat;
- char *mp = NULL; /* The malloced mount point. */
+ char *mp = NULL; /* The malloc'd mount point. */
if (save_cwd (&cwd) != 0)
{
diff --git a/src/find-mount-point.h b/src/find-mount-point.h
index 956cc3879..04c4c34d4 100644
--- a/src/find-mount-point.h
+++ b/src/find-mount-point.h
@@ -14,4 +14,4 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-extern char* find_mount_point (const char *, const struct stat *);
+extern char *find_mount_point (char const *, struct stat const *);