diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | compile.c | 2 | ||||
| -rw-r--r-- | dir.c | 2 | ||||
| -rw-r--r-- | gc.c | 4 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | node.h | 2 | ||||
| -rw-r--r-- | thread_pthread.c | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 2 |
9 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,15 @@ +Mon Dec 14 11:31:00 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * compile.c: fix typos. + [ci skip][fix GH-1140] Patch by @jutaz + * dir.c: ditto. + * gc.c: ditto. + * io.c: ditto. + * node.h: ditto. + * thread_pthread.c: ditto. + * vm_insnhelper.c: ditto. + * vsnprintf.c: ditto. + Mon Dec 14 11:27:01 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * enc/iso_2022_jp.h: fix typos. @@ -699,7 +699,7 @@ rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */ /* * On 32-bit SPARC, GCC by default generates SPARC V7 code that may require * 8-byte word alignment. On the other hand, Oracle Solaris Studio seems to - * generate SPARCV8PLUS code with unaligned memory accesss instructions. + * generate SPARCV8PLUS code with unaligned memory access instructions. * That is why the STRICT_ALIGNMENT is defined only with GCC. */ #if defined(__sparc) && SIZEOF_VOIDP == 4 && defined(__GNUC__) @@ -259,7 +259,7 @@ bracket( return ok == not ? NULL : (char *)p + 1; } -/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0') +/* If FNM_PATHNAME is set, only path element will be matched. (up to '/' or '\0') Otherwise, entire string will be matched. End marker itself won't be compared. And if function succeeds, *pcur reaches end marker. @@ -211,7 +211,7 @@ static ruby_gc_params_t gc_params = { * 1: enable assertions (to debug RGenGC) * 2: enable internal consistency check at each GC (for debugging) * 3: enable internal consistency check at each GC steps (for debugging) - * 4: enable livness check + * 4: enable liveness check * 5: show all references */ #ifndef RGENGC_CHECK_MODE @@ -5668,7 +5668,7 @@ gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace) } #if 1 - /* mark `a' and remember (default behaviour) */ + /* mark `a' and remember (default behavior) */ if (!rgengc_remembered(objspace, a)) { rgengc_remember(objspace, a); gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b)); @@ -3121,7 +3121,7 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io) newline = (unsigned char)rsptr[rslen - 1]; } - /* MS - Optimisation */ + /* MS - Optimization */ while ((c = appendline(fptr, newline, &str, &limit)) != EOF) { const char *s, *p, *pp, *e; @@ -261,7 +261,7 @@ typedef struct RNode { #define RNODE(obj) (R_CAST(RNode)(obj)) -/* FL : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8: TAINT, 9: UNTRUSTERD, 10: EXIVAR, 11: FREEZE */ +/* FL : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8: TAINT, 9: UNTRUSTED, 10: EXIVAR, 11: FREEZE */ /* NODE_FL: 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: NODE_FL_NEWLINE|NODE_FL_CREF_PUSHED_BY_EVAL, * 8..14: nd_type, * 15..: nd_line diff --git a/thread_pthread.c b/thread_pthread.c index 6638d53d21..2a15816713 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -520,7 +520,7 @@ size_t pthread_get_stacksize_np(pthread_t); /* * As the PTHREAD_STACK_MIN is undefined and - * noone touches the default stacksize, + * no one touches the default stacksize, * it is just fine to use the default. */ #define pthread_attr_get_np(thid, attr) 0 diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 79397fb311..3f06b31732 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -565,7 +565,7 @@ vm_get_const_key_cref(const VALUE *ep) cref = CREF_NEXT(cref); } - /* does not incldue singleton class */ + /* does not include singleton class */ return NULL; } diff --git a/vsnprintf.c b/vsnprintf.c index 21ba8b0768..075bb4b2fe 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -642,7 +642,7 @@ BSD_vfprintf(FILE *fp, const char *fmt0, va_list ap) flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \ (u_long)va_arg(ap, u_int)) - /* optimise fprintf(stderr) (and other unbuffered Unix files) */ + /* optimize fprintf(stderr) (and other unbuffered Unix files) */ if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) && fp->_file >= 0) return (BSD__sbprintf(fp, fmt0, ap)); |