Commit 4bdbdfbf authored by David Cole's avatar David Cole Committed by Kitware Robot
Browse files

Merge topic 'directory-typo'

6c8722fa Fix typo direcotry -> directory (and similar) [#13444]
parents 92b11383 6c8722fa
...@@ -131,7 +131,7 @@ ENDIF(KDECONFIG_EXECUTABLE) ...@@ -131,7 +131,7 @@ ENDIF(KDECONFIG_EXECUTABLE)
# at first the KDE include direcory # at first the KDE include directory
# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore # kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
HINTS HINTS
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
# #
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...) # macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
# create moc code from a list of files containing Qt class with # create moc code from a list of files containing Qt class with
# the Q_OBJECT declaration. Per-direcotry preprocessor definitions # the Q_OBJECT declaration. Per-directory preprocessor definitions
# are also added. Options may be given to moc, such as those found # are also added. Options may be given to moc, such as those found
# when executing "moc -help". # when executing "moc -help".
# #
......
...@@ -1043,7 +1043,7 @@ int cmake::AddCMakePaths() ...@@ -1043,7 +1043,7 @@ int cmake::AddCMakePaths()
{ {
cMakeRoot = cMakeRoot.substr(0, slashPos); cMakeRoot = cMakeRoot.substr(0, slashPos);
} }
// is there no Modules direcory there? // is there no Modules directory there?
modules = cMakeRoot + "/Modules/CMake.cmake"; modules = cMakeRoot + "/Modules/CMake.cmake";
} }
...@@ -1072,7 +1072,7 @@ int cmake::AddCMakePaths() ...@@ -1072,7 +1072,7 @@ int cmake::AddCMakePaths()
{ {
// next try exe // next try exe
cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
// is there no Modules direcory there? // is there no Modules directory there?
modules = cMakeRoot + "/Modules/CMake.cmake"; modules = cMakeRoot + "/Modules/CMake.cmake";
} }
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
......
...@@ -925,7 +925,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry) ...@@ -925,7 +925,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
if (fd < 0) if (fd < 0)
tree_enter_working_dir(t); tree_enter_working_dir(t);
/* The current direcotry fd is needed at /* The current directory fd is needed at
* archive_read_disk_entry_from_file() function to read link data * archive_read_disk_entry_from_file() function to read link data
* with readlinkat(). */ * with readlinkat(). */
a->entry_wd_fd = tree_current_dir_fd(t); a->entry_wd_fd = tree_current_dir_fd(t);
......
...@@ -955,7 +955,7 @@ _archive_read_disk_open_w(struct archive *_a, const wchar_t *pathname) ...@@ -955,7 +955,7 @@ _archive_read_disk_open_w(struct archive *_a, const wchar_t *pathname)
a->tree = tree_open(pathname, a->symlink_mode, a->restore_time); a->tree = tree_open(pathname, a->symlink_mode, a->restore_time);
if (a->tree == NULL) { if (a->tree == NULL) {
archive_set_error(&a->archive, ENOMEM, archive_set_error(&a->archive, ENOMEM,
"Can't allocate direcotry traversal data"); "Can't allocate directory traversal data");
a->archive.state = ARCHIVE_STATE_FATAL; a->archive.state = ARCHIVE_STATE_FATAL;
return (ARCHIVE_FATAL); return (ARCHIVE_FATAL);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment