[clang][clang-doc] fix asset option

Author: PeterChou1

clang-tools-extra/clang-doc/tool/ClangDocMain.cpp

@@ -133,19 +133,17 @@ std::string getFormatString() {
 // GetMainExecutable (since some platforms don't support taking the
 // address of main, and some platforms can't implement GetMainExecutable
 // without being given the address of a function in the main executable).
-std::string GetExecutablePath(const char *Argv0, void *MainAddr) {
+std::string getExecutablePath(const char *Argv0, void *MainAddr) {
   return llvm::sys::fs::getMainExecutable(Argv0, MainAddr);
 }
 
-llvm::Error GetAssetFiles(clang::doc::ClangDocContext &CDCtx) {
+llvm::Error getAssetFiles(clang::doc::ClangDocContext &CDCtx) {
   std::error_code Code;
+  llvm::SmallString<128> FilePath = llvm::SmallString<128>(UserAssetPath);
   for (auto DirIt = llvm::sys::fs::directory_iterator(UserAssetPath, Code),
             DirEnd = llvm::sys::fs::directory_iterator();
        !Code && DirIt != DirEnd; DirIt.increment(Code)) {
-    llvm::SmallString<128> FilePath = llvm::SmallString<128>(DirIt->path());
-    if (!Code) {
-      return llvm::createFileError(FilePath, Code);
-    }
+    FilePath = llvm::SmallString<128>(DirIt->path());
     if (llvm::sys::fs::is_regular_file(FilePath)) {
       if (llvm::sys::path::extension(FilePath) == ".css") {
         CDCtx.UserStylesheets.insert(CDCtx.UserStylesheets.begin(),
@@ -155,13 +153,16 @@ llvm::Error GetAssetFiles(clang::doc::ClangDocContext &CDCtx) {
       }
     }
   }
+  if (Code) {
+    return llvm::createFileError(FilePath, Code);
+  }
   return llvm::Error::success();
 }
 
-llvm::Error GetDefaultAssetFiles(const char *Argv0,
+llvm::Error getDefaultAssetFiles(const char *Argv0,
                                  clang::doc::ClangDocContext &CDCtx) {
-  void *MainAddr = (void *)(intptr_t)GetExecutablePath;
-  std::string ClangDocPath = GetExecutablePath(Argv0, MainAddr);
+  void *MainAddr = (void *)(intptr_t)getExecutablePath;
+  std::string ClangDocPath = getExecutablePath(Argv0, MainAddr);
   llvm::SmallString<128> NativeClangDocPath;
   llvm::sys::path::native(ClangDocPath, NativeClangDocPath);
 
@@ -178,14 +179,14 @@ llvm::Error GetDefaultAssetFiles(const char *Argv0,
 
   if (!llvm::sys::fs::is_regular_file(IndexJS)) {
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                   "error default index.js file at " + IndexJS +
-                                       "\n");
+                                   "error default index.js file missing at " +
+                                       IndexJS + "\n");
   }
 
   if (!llvm::sys::fs::is_regular_file(DefaultStylesheet)) {
     return llvm::createStringError(
         llvm::inconvertibleErrorCode(),
-        "error default clang-doc-default-stylesheet.css file at " +
+        "error default clang-doc-default-stylesheet.css file missing at " +
             DefaultStylesheet + "\n");
   }
 
@@ -198,17 +199,17 @@ llvm::Error GetDefaultAssetFiles(const char *Argv0,
   return llvm::Error::success();
 }
 
-llvm::Error GetHTMLAssetFiles(const char *Argv0,
+llvm::Error getHtmlAssetFiles(const char *Argv0,
                               clang::doc::ClangDocContext &CDCtx) {
   if (!UserAssetPath.empty() &&
       !llvm::sys::fs::is_directory(std::string(UserAssetPath))) {
     llvm::outs() << "Asset path supply is not a directory: " << UserAssetPath
                  << " falling back to default\n";
   }
   if (llvm::sys::fs::is_directory(std::string(UserAssetPath))) {
-    return GetAssetFiles(CDCtx);
+    return getAssetFiles(CDCtx);
   }
-  return GetDefaultAssetFiles(Argv0, CDCtx);
+  return getDefaultAssetFiles(Argv0, CDCtx);
 }
 
 int main(int argc, const char **argv) {
@@ -262,7 +263,7 @@ Example usage for a project using a compile commands database:
       {"index.js", "index_json.js"}};
 
   if (Format == "html") {
-    auto Err = GetHTMLAssetFiles(argv[0], CDCtx);
+    auto Err = getHtmlAssetFiles(argv[0], CDCtx);
     if (Err) {
       llvm::errs() << toString(std::move(Err)) << "\n";
       return 1;