X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcmem.c;h=48bc632b9ae58728a2145fd8fa4961c01257a3f9;hp=722c7075887f999812a430688a4390e975059149;hb=86e559d164166966a797a1e5855871d48e087ddd;hpb=d650cc4148ccd23f940ac60050c36c89897c168f diff --git a/src/cmem.c b/src/cmem.c index 722c707..48bc632 100644 --- a/src/cmem.c +++ b/src/cmem.c @@ -49,20 +49,17 @@ char *strndup_chk(const char *s, size_t len, const char *tag) char *strip_end(char *s) { - int i; - i = strlen(s) - 1; - while(i > 0 && (s[i] == '\n' || s[i] == ' ' || s[i] == '\t')) { - s[i--] = '\0'; + for(int i = strlen(s) - 1; i > 0 && (s[i] == '\n' || s[i] == ' ' || s[i] == '\t'); i--) { + s[i] = '\0'; } return s; } char *strip_casl2_comment(char *s) { - int i; bool quoting = false; - for(i = 0; s[i]; i++) { + for(int i = 0; s[i]; i++) { /* 「'」で囲まれた文字列の場合。「''」は無視 */ if(s[i] == '\'' && s[i+1] != '\'' && (quoting == false || s[i-1] != '\'')) { quoting = !quoting;