Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
commit4f19c1a995de507044d1b5ada7fb7398cdb32096 (patch)
treee46c13dd84a493177c80af0715f8f9b09c333943 /source/blender/blenlib/intern
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r--source/blender/blenlib/intern/BLI_ghash.c2
-rw-r--r--source/blender/blenlib/intern/BLI_mempool.c4
-rw-r--r--source/blender/blenlib/intern/bpath.c8
-rw-r--r--source/blender/blenlib/intern/math_geom.c2
-rw-r--r--source/blender/blenlib/intern/path_util.c16
-rw-r--r--source/blender/blenlib/intern/string_utf8.c6
6 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 49da6f9cb6b..28b4794ed1b 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -138,7 +138,7 @@ int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFre
valfreefp(e->val);
BLI_mempool_free(gh->entrypool, e);
- /* correct but 'e' isnt used before return */
+ /* correct but 'e' isn't used before return */
/* e= n; *//*UNUSED*/
if (p)
p->next = n;
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index cbded248589..3d16b3af4de 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -45,7 +45,7 @@
#include <string.h>
#include <stdlib.h>
-/* note: copied from BKE_utildefines.h, dont use here because we're in BLI */
+/* note: copied from BKE_utildefines.h, don't use here because we're in BLI */
#ifdef __BIG_ENDIAN__
/* Big Endian */
# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
@@ -237,7 +237,7 @@ void *BLI_mempool_calloc(BLI_mempool *pool)
return retval;
}
-/* doesnt protect against double frees, dont be stupid! */
+/* doesnt protect against double frees, don't be stupid! */
void BLI_mempool_free(BLI_mempool *pool, void *addr)
{
BLI_freenode *newhead = addr;
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 2134cb59dc6..c4a1d4b2b8d 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -30,10 +30,10 @@
*/
/* TODO,
- * currently there are some cases we dont support.
+ * currently there are some cases we don't support.
* - passing output paths to the visitor?, like render out.
* - passing sequence strips with many images.
- * - passing directory paths - visitors dont know which path is a dir or a file.
+ * - passing directory paths - visitors don't know which path is a dir or a file.
* */
#include <sys/stat.h>
@@ -191,7 +191,7 @@ void makeFilesAbsolute(Main *bmain, const char *basedir, ReportList *reports)
data.count_tot, data.count_changed, data.count_failed);
}
-/* find this file recursively, use the biggest file so thumbnails dont get used by mistake
+/* find this file recursively, use the biggest file so thumbnails don't get used by mistake
* - dir: subdir to search
* - filename: set this filename
* - filesize: filesize for the file
@@ -231,7 +231,7 @@ static int findFileRecursive(char *filename_new,
BLI_join_dirfile(path, sizeof(path), dirname, de->d_name);
if (stat(path, &status) != 0)
- continue; /* cant stat, dont bother with this file, could print debug info here */
+ continue; /* cant stat, don't bother with this file, could print debug info here */
if (S_ISREG(status.st_mode)) { /* is file */
if (strncmp(filename, de->d_name, FILE_MAX) == 0) { /* name matches */
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 84bc397a7f8..e2850daa5b8 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -872,7 +872,7 @@ int isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], cons
}
}
-/* note: return normal isnt unit length */
+/* note: return normal isn't unit length */
void isect_plane_plane_v3(float r_isect_co[3], float r_isect_no[3],
const float plane_a_co[3], const float plane_a_no[3],
const float plane_b_co[3], const float plane_b_no[3])
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index dccec7a6a42..9c80fa9ca15 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -482,7 +482,7 @@ void BLI_path_rel(char *file, const char *relfile)
#endif
{
++p; ++q;
- /* dont search beyond the end of the string
+ /* don't search beyond the end of the string
* in the rare case they match */
if ((*p=='\0') || (*q=='\0')) {
break;
@@ -560,7 +560,7 @@ static int stringframe_chars(char *path, int *char_start, int *char_end)
ch_sta = ch_end = 0;
for (i = 0; path[i] != '\0'; i++) {
if (path[i] == '\\' || path[i] == '/') {
- ch_end = 0; /* this is a directory name, dont use any hashes we found */
+ ch_end = 0; /* this is a directory name, don't use any hashes we found */
} else if (path[i] == '#') {
ch_sta = i;
ch_end = ch_sta+1;
@@ -569,7 +569,7 @@ static int stringframe_chars(char *path, int *char_start, int *char_end)
}
i = ch_end-1; /* keep searching */
- /* dont break, there may be a slash after this that invalidates the previous #'s */
+ /* don't break, there may be a slash after this that invalidates the previous #'s */
}
}
@@ -681,7 +681,7 @@ int BLI_path_abs(char *path, const char *basepath)
BLI_strncpy(base, basepath, sizeof(base));
- /* file component is ignored, so dont bother with the trailing slash */
+ /* file component is ignored, so don't bother with the trailing slash */
BLI_cleanup_path(NULL, base);
/* push slashes into unix mode - strings entering this part are
@@ -694,7 +694,7 @@ int BLI_path_abs(char *path, const char *basepath)
BLI_char_switch(base, '\\', '/');
/* Paths starting with // will get the blend file as their base,
- * this isnt standard in any os but is used in blender all over the place */
+ * this isn't standard in any os but is used in blender all over the place */
if (wasrelative) {
char *lslash= BLI_last_slash(base);
if (lslash) {
@@ -747,7 +747,7 @@ int BLI_path_cwd(char *path)
if (wasrelative==1) {
char cwd[FILE_MAX]= "";
- BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isnt used */
+ BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isn't used */
if (cwd[0] == '\0') {
printf( "Could not get the current working directory - $PWD for an unknown reason.");
@@ -756,7 +756,7 @@ int BLI_path_cwd(char *path)
*
* cwd should contain c:\ etc on win32 so the relbase can be NULL
* relbase being NULL also prevents // being misunderstood as relative to the current
- * blend file which isnt a feature we want to use in this case since were dealing
+ * blend file which isn't a feature we want to use in this case since were dealing
* with a path from the command line, rather than from inside Blender */
char origpath[FILE_MAX];
@@ -1672,7 +1672,7 @@ char *BLI_last_slash(const char *string)
else return lfslash;
}
-/* adds a slash if there isnt one there already */
+/* adds a slash if there isn't one there already */
int BLI_add_slash(char *string)
{
int len = strlen(string);
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index c60df413161..55ad30ab5dd 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -184,7 +184,7 @@ char *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy)
{
char *dst_r= dst;
- /* note: currently we dont attempt to deal with invalid utf8 chars */
+ /* note: currently we don't attempt to deal with invalid utf8 chars */
BLI_STR_UTF8_CPY(dst, src, maxncpy)
return dst_r;
@@ -210,7 +210,7 @@ char *BLI_strncat_utf8(char *dst, const char *src, size_t maxncpy)
size_t BLI_strncpy_wchar_as_utf8(char *dst, const wchar_t *src, const size_t maxcpy)
{
size_t len = 0;
- while(*src && len < maxcpy) { /* XXX can still run over the buffer because utf8 size isnt known :| */
+ while(*src && len < maxcpy) { /* XXX can still run over the buffer because utf8 size isn't known :| */
len += BLI_str_utf8_from_unicode(*src++, dst+len);
}
@@ -284,7 +284,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size
/* copied from glib's gutf8.c */
/* note, glib uses unsigned int for unicode, best we do the same,
- * though we dont typedef it - campbell */
+ * though we don't typedef it - campbell */
#define UTF8_COMPUTE(Char, Mask, Len) \
if (Char < 128) { \