Merged changes in the trunk up to revision 51718.
[blender.git] / source / blender / blenlib / intern / bpath.c
index bdcb3cb9806f37c4ac8d077a71d1fcc954b278d9..2f335b557fe33d63a709261bed2d0a3735c787ac 100644 (file)
@@ -86,7 +86,7 @@ static int checkMissingFiles_visit_cb(void *userdata, char *UNUSED(path_dst), co
        ReportList *reports = (ReportList *)userdata;
 
        if (!BLI_exists(path_src)) {
-               BKE_reportf(reports, RPT_WARNING, "Path Not Found \"%s\"", path_src);
+               BKE_reportf(reports, RPT_WARNING, "Path '%s' not found", path_src);
        }
 
        return FALSE;
@@ -123,7 +123,7 @@ static int makeFilesRelative_visit_cb(void *userdata, char *path_dst, const char
                        data->count_changed++;
                }
                else {
-                       BKE_reportf(data->reports, RPT_WARNING, "Path cant be made relative \"%s\"", path_src);
+                       BKE_reportf(data->reports, RPT_WARNING, "Path '%s' cannot be made relative", path_src);
                        data->count_failed++;
                }
                return TRUE;
@@ -145,7 +145,7 @@ void BLI_bpath_relative_convert(Main *bmain, const char *basedir, ReportList *re
        BLI_bpath_traverse_main(bmain, makeFilesRelative_visit_cb, 0, (void *)&data);
 
        BKE_reportf(reports, data.count_failed ? RPT_WARNING : RPT_INFO,
-                   "Total files %d|Changed %d|Failed %d",
+                   "Total files %d | Changed %d | Failed %d",
                    data.count_tot, data.count_changed, data.count_failed);
 }
 
@@ -165,7 +165,7 @@ static int makeFilesAbsolute_visit_cb(void *userdata, char *path_dst, const char
                        data->count_changed++;
                }
                else {
-                       BKE_reportf(data->reports, RPT_WARNING, "Path cant be made absolute \"%s\"", path_src);
+                       BKE_reportf(data->reports, RPT_WARNING, "Path '%s' cannot be made absolute", path_src);
                        data->count_failed++;
                }
                return TRUE;
@@ -188,13 +188,13 @@ void BLI_bpath_absolute_convert(Main *bmain, const char *basedir, ReportList *re
        BLI_bpath_traverse_main(bmain, makeFilesAbsolute_visit_cb, 0, (void *)&data);
 
        BKE_reportf(reports, data.count_failed ? RPT_WARNING : RPT_INFO,
-                   "Total files %d|Changed %d|Failed %d",
+                   "Total files %d | Changed %d | Failed %d",
                    data.count_tot, data.count_changed, data.count_failed);
 }
 
 /**
  * find this file recursively, use the biggest file so thumbnails don't get used by mistake
- * \param filename_new: the path will be copied here, caller must initialize as empyu string.
+ * \param filename_new: the path will be copied here, caller must initialize as empty string.
  * \param dirname: subdir to search
  * \param filename: set this filename
  * \param filesize: filesize for the file
@@ -280,13 +280,13 @@ static int findMissingFiles_visit_cb(void *userdata, char *path_dst, const char
 
        if (filesize == -1) { /* could not open dir */
                BKE_reportf(data->reports, RPT_WARNING,
-                           "Could open directory \"%s\"",
+                           "Could not open directory '%s'",
                            BLI_path_basename(data->searchdir));
                return FALSE;
        }
        else if (found == FALSE) {
                BKE_reportf(data->reports, RPT_WARNING,
-                           "Could not find \"%s\" in \"%s\"",
+                           "Could not find '%s' in '%s'",
                            BLI_path_basename((char *)path_src), data->searchdir);
                return FALSE;
        }