From ae32d0288b8c6b1cbca82af779b1d29111132df5 Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Sat, 10 Sep 2016 14:55:27 -0700 Subject: [PATCH] Remove fish_wcstoi decl - fix style --- src/builtin.cpp | 5 +++-- src/wutil.h | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/builtin.cpp b/src/builtin.cpp index 0730f69a1..da131e729 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -90,8 +90,9 @@ bool builtin_data_t::operator<(const builtin_data_t *other) const { /// int builtin_count_args(const wchar_t *const *argv) { int argc; - for (argc = 1; argv[argc] != NULL; argc++) - ; + for (argc = 1; argv[argc] != NULL;){ + argc++; + } assert(argv[argc] == NULL); return argc; diff --git a/src/wutil.h b/src/wutil.h index 2c72716be..d0f1a7944 100644 --- a/src/wutil.h +++ b/src/wutil.h @@ -59,8 +59,6 @@ int wmkdir(const wcstring &dir, int mode); int wrename(const wcstring &oldName, const wcstring &newName); -int fish_wcstoi(const wchar_t *str, wchar_t **endptr, int base); - /// Class for representing a file's inode. We use this to detect and avoid symlink loops, among /// other things. While an inode / dev pair is sufficient to distinguish co-existing files, Linux /// seems to aggressively re-use inodes, so it cannot determine if a file has been deleted (ABA