Changeset 9612
- Timestamp:
- 2005-04-08T15:41:31+12:00 (19 years ago)
- Location:
- trunk
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/indexers/mgpp/lib/bitio_m_abstract.h
r3365 r9612 22 22 while (_B_x != 0) { 23 23 _B_x >>= 1; 24 reply ++;24 ++reply; 25 25 } 26 26 return reply; … … 35 35 while (_B_x != 0) { 36 36 _B_x >>= 1; 37 reply ++;37 ++reply; 38 38 } 39 39 return reply; … … 44 44 45 45 x = 1; 46 while (!this->bit()) x++;46 while (!this->bit()) ++x; 47 47 if (count != NULL) { 48 48 *count += x; … … 72 72 _B_logofb = ceil_log2(_B_b); 73 73 _B_thresh = (1<<_B_logofb) - _B_b; 74 _B_logofb--;74 --_B_logofb; 75 75 76 76 if (count != NULL) { … … 78 78 } 79 79 80 for (_B_i=0; _B_i < _B_logofb; _B_i++) {80 for (_B_i=0; _B_i < _B_logofb; ++_B_i) { 81 81 _B_x += _B_x + this->bit(); 82 82 } … … 123 123 124 124 _B_xdivb = this->unary_decode(count); 125 _B_xdivb--;125 --_B_xdivb; 126 126 while (_B_xdivb--) { 127 127 _B_xx += _B_bb; … … 136 136 register int _B_xdivb = 0; 137 137 check_positive("bblock", _B_xx); 138 _B_xx--;138 --_B_xx; 139 139 while (_B_xx >= _B_bb) { 140 _B_xdivb++;140 ++_B_xdivb; 141 141 _B_xx -= _B_bb; 142 142 } … … 154 154 155 155 _B_k = this->unary_decode(count); 156 _B_k--;156 --_B_k; 157 157 while (_B_k--) { 158 158 _B_lower = _B_upper+1; … … 161 161 } 162 162 _B_xx = this->binary_decode(_B_upper-_B_lower+1, count); 163 _B_xx--;163 --_B_xx; 164 164 check_positive("gamma", _B_xx+_B_lower); 165 165 return _B_xx+_B_lower; … … 177 177 178 178 while ((int)_B_xx>_B_upper) { 179 _B_k++;179 ++_B_k; 180 180 _B_lower = _B_upper+1; 181 181 _B_pow *= _B_s; … … 190 190 register int _B_nbits = 0; 191 191 192 while(!this->bit()) _B_nbits++;192 while(!this->bit()) ++_B_nbits; 193 193 if (count != NULL) { 194 194 *count += _B_nbits*2+1; … … 219 219 register int _B_logx; 220 220 _B_logx = gamma_decode(count); 221 _B_logx--;221 --_B_logx; 222 222 _B_xxx = binary_decode(1<<_B_logx, count); 223 _B_xxx--;223 --_B_xxx; 224 224 return (_B_xxx + (1<<_B_logx)); 225 225 } … … 241 241 do { 242 242 __code += __code + bit(); 243 if (count != NULL) (*count) ++;243 if (count != NULL) ++(*count); 244 244 } while (__code < *++__mclen); 245 245 … … 252 252 register int __clen = lens[x]; 253 253 register unsigned long __code = codes[x]; 254 for (__i=__clen-1; __i>=0; __i--) {254 for (__i=__clen-1; __i>=0; --__i) { 255 255 encodeBit((__code >> __i) & 1); 256 256 } … … 284 284 285 285 check_positive("bblock", _B_xx); 286 _B_xx--;286 --_B_xx; 287 287 while (_B_xx >= _B_bb) { 288 _B_xdivb++;288 ++_B_xdivb; 289 289 _B_xx -= _B_bb; 290 290 } … … 307 307 308 308 while ((int)(_B_xx)>_B_upper) { 309 _B_k++;309 ++_B_k; 310 310 _B_lower = _B_upper+1; 311 311 _B_pow *= _B_s; -
trunk/indexers/mgpp/lib/bitio_m_mem.cpp
r3365 r9612 43 43 if (remaining != 0) { 44 44 buffer = *pos++; 45 remaining --;45 --remaining; 46 46 } else { 47 47 buffer = 0xff; … … 60 60 if (remaining != 0) { 61 61 buffer = *pos++; 62 remaining --;62 --remaining; 63 63 } else { 64 64 buffer = 0x00; … … 81 81 } else { 82 82 buffer = *pos++; 83 remaining--;83 --remaining; 84 84 btg = sizeof(buffer) * 8; 85 85 } … … 90 90 91 91 void mem_bitio_buffer::encodeBit(int b) { 92 btg--;92 --btg; 93 93 if (b) buffer |= (1 << btg); 94 94 … … 96 96 if (remaining) { 97 97 *pos++ = buffer; 98 remaining--;98 --remaining; 99 99 } 100 100 buffer = 0; … … 107 107 if (remaining) { 108 108 *pos++ = buffer; 109 remaining--;109 --remaining; 110 110 } 111 111 } -
trunk/indexers/mgpp/lib/bitio_m_mems.cpp
r3365 r9612 46 46 { 47 47 b = b + b + (base[pos>>3] & (0x80 >> (pos & 0x07)) != 0); 48 pos ++;48 ++pos; 49 49 } 50 50 while(0); … … 60 60 int mems_bitio_buffer::bit() 61 61 { 62 pos ++;62 ++pos; 63 63 return ((base[(pos-1)>>3] & (0x80 >> ((pos-1) & 0x07))) != 0); 64 64 } … … 70 70 else 71 71 base[pos>>3] &= 0xff7f >> (pos & 0x07); 72 pos++;72 ++pos; 73 73 } 74 74 -
trunk/indexers/mgpp/lib/bitio_m_random.cpp
r8692 r9612 36 36 // make sure the length is a power of 2 37 37 while (len != 0) { 38 shift ++;38 ++shift; 39 39 len = len >> 1; 40 40 } … … 107 107 } 108 108 used = 1; 109 pos ++;109 ++pos; 110 110 111 111 if ((pos >> 3) >= len) … … 162 162 { 163 163 // fprintf(stderr, "Bit in"); 164 pos ++;164 ++pos; 165 165 if (((pos - 1) >> 3) >= len) 166 166 { -
trunk/indexers/mgpp/lib/bitio_m_stdio.cpp
r3365 r9612 82 82 void stdio_bitio_buffer::encodeBit(int b) 83 83 { 84 btg--;84 --btg; 85 85 if (b != 0) 86 86 buffer |= (1 << btg); -
trunk/indexers/mgpp/lib/local_strings.cpp
r3365 r9612 208 208 209 209 while (i < l && *++s1 == *++s2) 210 i++;210 ++i; 211 211 return (i); 212 212 } … … 283 283 284 284 memset (buf, '\0', sizeof(buf)); 285 for (i = 0; i < len; i++)285 for (i = 0; i < len; ++i) 286 286 { 287 287 strcpy (p, char2str (s[i])); … … 309 309 if (*s == '\\') 310 310 { 311 s++;311 ++s; 312 312 switch (*s++) 313 313 { 314 314 case '\0': 315 315 *d++ = '\\'; 316 s--;316 --s; 317 317 break; 318 318 case '\\': … … 402 402 403 403 str_base = str; 404 for (i = 0; i < len; i++)404 for (i = 0; i < len; ++i) 405 405 { 406 406 *str++ = *str255++; -
trunk/indexers/mgpp/lib/lovinstem.cpp
r3365 r9612 626 626 if (rule->end_group) 627 627 break; 628 rule++;628 ++rule; 629 629 } 630 630 } … … 1166 1166 } 1167 1167 } 1168 suffix_start++;1168 ++suffix_start; 1169 1169 } 1170 1170 while (not_done && ((ch1 = *suffix_start) != EOS)); -
trunk/indexers/mgpp/lib/mgheap.cpp
r3365 r9612 26 26 register int __i; \ 27 27 register char *__a = (a), *__b = (b); \ 28 for (__i = (s); __i; __i--) \28 for (__i = (s); __i; --__i) \ 29 29 { \ 30 30 register char __t = *__a; \ … … 39 39 register int __i; \ 40 40 register char *__dst = (dst), *__src = (src); \ 41 for (__i = (s); __i; __i--) \41 for (__i = (s); __i; --__i) \ 42 42 *__dst++ = *__src++; \ 43 43 } while(0) … … 53 53 if (child < num && hc ((char *) heap + child * size, 54 54 (char *) heap + child * size - size) < 0) 55 child++;55 ++child; 56 56 if (hc ((char *) heap + (curr - 1) * size, (char *) heap + (child - 1) * size) > 0) 57 57 { … … 91 91 { 92 92 register int i; 93 for (i = num / 2; i > 0; i--)93 for (i = num / 2; i > 0; --i) 94 94 heap_heapify (heap, size, num, i, hc); 95 95 } … … 111 111 { 112 112 register int i; 113 for (i = num; i > 1; i--)113 for (i = num; i > 1; --i) 114 114 { 115 115 SWAP (size, (char *) heap, (char *) heap + (i - 1) * size); … … 122 122 heap_deletehead (void *heap, int size, int *num, heap_comp hc) 123 123 { 124 (*num)--;124 --(*num); 125 125 SWAP (size, (char *) heap, (char *) heap + *num * size); 126 126 heap_heapify (heap, size, *num, 1, hc); … … 144 144 heap_additem (void *heap, int size, int *num, heap_comp hc) 145 145 { 146 (*num)++;146 ++(*num); 147 147 heap_pullup (heap, size, *num, hc); 148 148 } -
trunk/indexers/mgpp/lib/perf_hash.cpp
r3365 r9612 213 213 Stack[StackPos].v = v; 214 214 Stack[StackPos].m = 0; 215 StackPos++;215 ++StackPos; 216 216 while (StackPos) 217 217 { 218 218 int m, b; 219 StackPos--;219 --StackPos; 220 220 e = Stack[StackPos].e; 221 221 v = Stack[StackPos].v; … … 277 277 /* build list of edges for each node */ 278 278 for (v = 1; v <= n; FIRST[v++] = 0); 279 for (e = 1; e <= m; e++)279 for (e = 1; e <= m; ++e) 280 280 { 281 281 NEXT[A + e] = FIRST[NODEa[e]]; … … 293 293 S.sp = 0; /* empty the stack */ 294 294 mk[0] = ERASED; /* a sentinel for the test below */ 295 for (v = 1; v <= n; v++)295 for (v = 1; v <= n; ++v) 296 296 { 297 297 if (mk[e = norm (unique (v))] == MEMBER) … … 324 324 *n = (int) (num * c + 1); 325 325 /* initialize tables of random integers */ 326 for (i = 0; i < MAX_CH; i++)327 for (j = 0; j < MAX_L; j++)326 for (i = 0; i < MAX_CH; ++i) 327 for (j = 0; j < MAX_L; ++j) 328 328 { 329 329 #ifndef STRUCT … … 340 340 341 341 /* compute an edge (NODEa[e], NODEb[e], NODEc[e]) for each word */ 342 for (e = 1; e <= num; e++)342 for (e = 1; e <= num; ++e) 343 343 { 344 344 /*generate an edge corresponding to the ith word */ … … 363 363 if (++j >= MAX_L) 364 364 j = 0; 365 w++;365 ++w; 366 366 } 367 367 while (--l); … … 460 460 461 461 /*for each word compute its place in hash table and check if correct */ 462 for (e = 1; e <= m; e++)462 for (e = 1; e <= m; ++e) 463 463 { 464 464 if ((e - 1) != (g[NODEa[e]] ^ g[NODEb[e]] ^ g[NODEc[e]])) … … 538 538 printf ("#define _HFM %d\n#define _HXL %d\n", m, MAX_L); 539 539 printf ("#define _HFA %d\n\nstatic int g[_HFN] = {\n", lc - fc + 1); 540 for (i = 1; i < n; i++)540 for (i = 1; i < n; ++i) 541 541 { 542 542 if (i % 8 == 0) … … 547 547 548 548 printf ("static int mt1[_HFA][_HXL] = {\n"); 549 for (j = fc; j < lc; j++)549 for (j = fc; j < lc; ++j) 550 550 { 551 551 printf ("{"); 552 for (i = 0; i < MAX_L - 1; i++)552 for (i = 0; i < MAX_L - 1; ++i) 553 553 printf ("%*d,", w, tb0[j][i]); 554 554 printf ("%*d},\n", w, tb0[j][MAX_L - 1]); 555 555 } 556 556 printf ("{"); 557 for (i = 0; i < MAX_L - 1; i++)557 for (i = 0; i < MAX_L - 1; ++i) 558 558 printf ("%*d,", w, tb0[lc][i]); 559 559 printf ("%*d}\n", w, tb0[lc][MAX_L - 1]); … … 561 561 562 562 printf ("static int mt2[_HFA][_HXL] = {\n"); 563 for (j = fc; j < lc; j++)563 for (j = fc; j < lc; ++j) 564 564 { 565 565 printf ("{"); 566 for (i = 0; i < MAX_L - 1; i++)566 for (i = 0; i < MAX_L - 1; ++i) 567 567 printf ("%*d,", w, tb1[j][i]); 568 568 printf ("%*d},\n", w, tb1[j][MAX_L - 1]); 569 569 } 570 570 printf ("{"); 571 for (i = 0; i < MAX_L - 1; i++)571 for (i = 0; i < MAX_L - 1; ++i) 572 572 printf ("%*d,", w, tb1[lc][i]); 573 573 printf ("%*d}\n", w, tb1[lc][MAX_L - 1]); … … 575 575 576 576 printf ("static int mt3[_HFA][_HXL] = {\n"); 577 for (j = fc; j < lc; j++)577 for (j = fc; j < lc; ++j) 578 578 { 579 579 printf ("{"); 580 for (i = 0; i < MAX_L - 1; i++)580 for (i = 0; i < MAX_L - 1; ++i) 581 581 printf ("%*d,", w, tb2[j][i]); 582 582 printf ("%*d},\n", w, tb2[j][MAX_L - 1]); 583 583 } 584 584 printf ("{"); 585 for (i = 0; i < MAX_L - 1; i++)585 for (i = 0; i < MAX_L - 1; ++i) 586 586 printf ("%*d,", w, tb2[lc][i]); 587 587 printf ("%*d}\n", w, tb2[lc][MAX_L - 1]); … … 606 606 607 607 MAX_L = 1; 608 for (i = 0; i < num; i++)608 for (i = 0; i < num; ++i) 609 609 { 610 610 unsigned len = keys[i][0]; 611 611 u_char *s = keys[i] + 1; 612 for (; len; len--, s++)612 for (; len; len--, ++s) 613 613 translate[*s] = 1; 614 614 if (i) … … 621 621 } 622 622 j = 0; 623 for (i = 0; i < 256; i++)623 for (i = 0; i < 256; ++i) 624 624 if (translate[i]) 625 625 translate[i] = j++; … … 657 657 Xfree (g); 658 658 #ifndef STRUCT 659 for (i = 0; i < MAX_CH; i++)659 for (i = 0; i < MAX_CH; ++i) 660 660 { 661 661 if (tb0 && tb0[i]) … … 673 673 Xfree (tb2); 674 674 #else 675 for (i = 0; i < MAX_CH; i++)675 for (i = 0; i < MAX_CH; ++i) 676 676 if (tb && tb[i]) 677 677 Xfree (tb[i]); … … 697 697 tb1 = Xmalloc (sizeof (int *) * MAX_CH); 698 698 tb2 = Xmalloc (sizeof (int *) * MAX_CH); 699 for (i = 0; i < MAX_CH; i++)699 for (i = 0; i < MAX_CH; ++i) 700 700 { 701 701 if (tb0) … … 718 718 #else 719 719 tb = (tb_entry **)Xmalloc (sizeof (struct tb_entry *) * MAX_CH); 720 for (i = 0; i < MAX_CH; i++)720 for (i = 0; i < MAX_CH; ++i) 721 721 if (tb) 722 722 if (!(tb[i] = (tb_entry *)Xmalloc (sizeof (struct tb_entry) * MAX_L))) … … 809 809 810 810 /* [RPAP - Jan 97: Endian Ordering] */ 811 for (i = 0; i < phd->MAX_N + 1; i++)811 for (i = 0; i < phd->MAX_N + 1; ++i) 812 812 HTONSI(phd->g[i]); 813 813 … … 815 815 816 816 /* [RPAP - Jan 97: Endian Ordering] */ 817 for (i = 0; i < phd->MAX_N + 1; i++)817 for (i = 0; i < phd->MAX_N + 1; ++i) 818 818 NTOHSI(phd->g[i]); 819 819 820 820 #ifndef STRUCT 821 for (i = 0; i < phd->MAX_CH; i++)821 for (i = 0; i < phd->MAX_CH; ++i) 822 822 { 823 823 /* [RPAP - Jan 97: Endian Ordering] */ 824 824 int j; 825 for (j = 0; j < phd->MAX_L; j++)825 for (j = 0; j < phd->MAX_L; ++j) 826 826 { 827 827 HTONSI(phd->tb0[i][j]); … … 838 838 839 839 /* [RPAP - Jan 97: Endian Ordering] */ 840 for (j = 0; j < phd->MAX_L; j++)840 for (j = 0; j < phd->MAX_L; ++j) 841 841 { 842 842 NTOHSI(phd->tb0[i][j]); … … 846 846 } 847 847 #else 848 for (i = 0; i < phd->MAX_CH; i++)848 for (i = 0; i < phd->MAX_CH; ++i) 849 849 { 850 850 /* [RPAP - Jan 97: Endian Ordering] */ 851 851 int j; 852 for (j = 0; j < phd->MAX_L; j++)852 for (j = 0; j < phd->MAX_L; ++j) 853 853 { 854 854 HTONSL(phd->tb[i][j].tb0); … … 861 861 862 862 /* [RPAP - Jan 97: Endian Ordering] */ 863 for (j = 0; j < phd->MAX_L; j++)863 for (j = 0; j < phd->MAX_L; ++j) 864 864 { 865 865 NTOHSL(phd->tb[i][j].tb0); … … 899 899 phd->tb1 = Xmalloc (sizeof (int *) * phd->MAX_CH); 900 900 phd->tb2 = Xmalloc (sizeof (int *) * phd->MAX_CH); 901 for (i = 0; i < phd->MAX_CH; i++)901 for (i = 0; i < phd->MAX_CH; ++i) 902 902 { 903 903 if (phd->tb0) … … 917 917 if (phd->g) 918 918 Xfree (phd->g); 919 for (i = 0; i < MAX_CH; i++)919 for (i = 0; i < MAX_CH; ++i) 920 920 { 921 921 if (phd->tb0 && phd->tb0[i]) … … 939 939 940 940 /* [RPAP - Jan 97: Endian Ordering] */ 941 for (i = 0; i < phd->MAX_N + 1; i++)941 for (i = 0; i < phd->MAX_N + 1; ++i) 942 942 NTOHSI(phd->g[i]); 943 943 944 for (i = 0; i < phd->MAX_CH; i++)944 for (i = 0; i < phd->MAX_CH; ++i) 945 945 { 946 946 int j; … … 954 954 955 955 /* [RPAP - Jan 97: Endian Ordering] */ 956 for (j = 0; j < phd->MAX_L; j++)956 for (j = 0; j < phd->MAX_L; ++j) 957 957 { 958 958 NTOHSI(phd->tb0[i][j]); … … 963 963 #else 964 964 phd->tb = (struct tb_entry **)Xmalloc (sizeof (struct tb_entry *) * phd->MAX_CH); 965 for (i = 0; i < phd->MAX_CH; i++)965 for (i = 0; i < phd->MAX_CH; ++i) 966 966 if (phd->tb) 967 967 if (!(phd->tb[i] = (struct tb_entry *)Xmalloc (sizeof (struct tb_entry) * phd->MAX_L))) … … 973 973 if (phd->g) 974 974 Xfree (phd->g); 975 for (i = 0; i < MAX_CH; i++)975 for (i = 0; i < MAX_CH; ++i) 976 976 if (phd->tb && phd->tb[i]) 977 977 Xfree (phd->tb[i]); … … 985 985 986 986 /* [RPAP - Jan 97: Endian Ordering] */ 987 for (i = 0; i < phd->MAX_N + 1; i++)987 for (i = 0; i < phd->MAX_N + 1; ++i) 988 988 NTOHSI(phd->g[i]); 989 989 990 for (i = 0; i < phd->MAX_CH; i++)990 for (i = 0; i < phd->MAX_CH; ++i) 991 991 { 992 992 int j; … … 996 996 997 997 /* [RPAP - Jan 97: Endian Ordering] */ 998 for (j = 0; j < phd->MAX_L; j++)998 for (j = 0; j < phd->MAX_L; ++j) 999 999 { 1000 1000 NTOHSL(phd->tb[i][j].tb0); … … 1015 1015 if (phd->g) 1016 1016 Xfree (phd->g); 1017 for (i = 0; i < phd->MAX_CH; i++)1017 for (i = 0; i < phd->MAX_CH; ++i) 1018 1018 if (phd->tb && phd->tb[i]) 1019 1019 Xfree (phd->tb[i]); … … 1051 1051 if (++i >= phd->MAX_L) 1052 1052 i = 0; 1053 l--;1054 s++;1053 --l; 1054 ++s; 1055 1055 } 1056 1056 if (u == v && ++v >= phd->MAX_N) -
trunk/indexers/mgpp/lib/simplefrenchstem.cpp
r3365 r9612 46 46 wordstart[last-1]='l'; 47 47 } 48 last--;48 --last; 49 49 50 50 } else { 51 if (last>=0 && wordstart[last]=='s') last--;52 if (last>=0 && wordstart[last]=='r') last--;53 if (last>=0 && wordstart[last]=='e') last--;51 if (last>=0 && wordstart[last]=='s') --last; 52 if (last>=0 && wordstart[last]=='r') --last; 53 if (last>=0 && wordstart[last]=='e') --last; 54 54 55 55 /* letter with accent e + ' -- there are two possible encodings */ 56 56 if (last>=0 && wordstart[last]==0xe9) { 57 last--;57 --last; 58 58 } else if (last>=1 && wordstart[last-1]=='e' && wordstart[last]==0x301) { 59 59 last -= 2; 60 60 } 61 61 62 if (last >= 1 && wordstart[last]==wordstart[last-1]) last--;62 if (last >= 1 && wordstart[last]==wordstart[last-1]) --last; 63 63 } /* end else */ 64 64 -
trunk/indexers/mgpp/lib/strstr.cpp
r3365 r9612 29 29 char *s = s1; 30 30 31 for (p2 = s2, i = 0; *s; p2 = s2, i++, s++)31 for (p2 = s2, i = 0; *s; p2 = s2, ++i, ++s) 32 32 { 33 for (p1 = s; *p1 && *p2 && *p1 == *p2; p1++, p2++)33 for (p1 = s; *p1 && *p2 && *p1 == *p2; ++p1, ++p2) 34 34 ; 35 35 if (!*p2) -
trunk/indexers/mgpp/lib/unitool.cpp
r3365 r9612 1419 1419 if (leninc > 1) { 1420 1420 /* we have to shift the array along */ 1421 for (i=curlen-1; i>=curpos; i--) {1421 for (i=curlen-1; i>=curpos; --i) { 1422 1422 input[i+leninc] = input[i]; 1423 1423 } … … 1427 1427 1428 1428 /* decompose the character */ 1429 for (i=0; i<=leninc; i++) {1429 for (i=0; i<=leninc; ++i) { 1430 1430 input[curpos+i] = decompose_info[tablepos].str[i]; 1431 1431 } … … 1441 1441 } else { 1442 1442 /* the character cannot be decomposed */ 1443 curpos++;1443 ++curpos; 1444 1444 } 1445 1445 } … … 1487 1487 min_value = 0; /* 00 */ 1488 1488 1489 while (letter_here < letter_end && letter_here->last < i) letter_here++;1489 while (letter_here < letter_end && letter_here->last < i) ++letter_here; 1490 1490 if (letter_here < letter_end && letter_here->last <= min_end) { 1491 1491 min_start = letter_here->first; … … 1494 1494 } 1495 1495 1496 while (digit_here < digit_end && digit_here->last < i) digit_here++;1496 while (digit_here < digit_end && digit_here->last < i) ++digit_here; 1497 1497 if (digit_here < digit_end && digit_here->last <= min_end) { 1498 1498 min_start = digit_here->first; … … 1501 1501 } 1502 1502 1503 while (space_here < space_end && space_here->last < i) space_here++;1503 while (space_here < space_end && space_here->last < i) ++space_here; 1504 1504 if (space_here < space_end && space_here->last <= min_end) { 1505 1505 min_start = space_here->first; … … 1530 1530 unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 1531 1531 (min_value & mask); 1532 i++;1532 ++i; 1533 1533 } 1534 1534 } … … 1616 1616 /* keep going till you find the null-terminator */ 1617 1617 while (*str != 0) { 1618 len++;1619 str++;1618 ++len; 1619 ++str; 1620 1620 } 1621 1621 … … 1629 1629 /* keep going till you find the null-terminator */ 1630 1630 while (*str != 0 && len < max_length ) { 1631 len++;1632 str++;1631 ++len; 1632 ++str; 1633 1633 } 1634 1634 … … 1713 1713 /* store the character */ 1714 1714 *outhere = c; 1715 outhere++;1716 outlen++;1715 ++outhere; 1716 ++outlen; 1717 1717 } 1718 1718 } … … 1747 1747 outhere += clen; 1748 1748 outlen += clen; 1749 in_i++;1749 ++in_i; 1750 1750 } 1751 1751 -
trunk/mgpp/lib/bitio_m_abstract.h
r3365 r9612 22 22 while (_B_x != 0) { 23 23 _B_x >>= 1; 24 reply ++;24 ++reply; 25 25 } 26 26 return reply; … … 35 35 while (_B_x != 0) { 36 36 _B_x >>= 1; 37 reply ++;37 ++reply; 38 38 } 39 39 return reply; … … 44 44 45 45 x = 1; 46 while (!this->bit()) x++;46 while (!this->bit()) ++x; 47 47 if (count != NULL) { 48 48 *count += x; … … 72 72 _B_logofb = ceil_log2(_B_b); 73 73 _B_thresh = (1<<_B_logofb) - _B_b; 74 _B_logofb--;74 --_B_logofb; 75 75 76 76 if (count != NULL) { … … 78 78 } 79 79 80 for (_B_i=0; _B_i < _B_logofb; _B_i++) {80 for (_B_i=0; _B_i < _B_logofb; ++_B_i) { 81 81 _B_x += _B_x + this->bit(); 82 82 } … … 123 123 124 124 _B_xdivb = this->unary_decode(count); 125 _B_xdivb--;125 --_B_xdivb; 126 126 while (_B_xdivb--) { 127 127 _B_xx += _B_bb; … … 136 136 register int _B_xdivb = 0; 137 137 check_positive("bblock", _B_xx); 138 _B_xx--;138 --_B_xx; 139 139 while (_B_xx >= _B_bb) { 140 _B_xdivb++;140 ++_B_xdivb; 141 141 _B_xx -= _B_bb; 142 142 } … … 154 154 155 155 _B_k = this->unary_decode(count); 156 _B_k--;156 --_B_k; 157 157 while (_B_k--) { 158 158 _B_lower = _B_upper+1; … … 161 161 } 162 162 _B_xx = this->binary_decode(_B_upper-_B_lower+1, count); 163 _B_xx--;163 --_B_xx; 164 164 check_positive("gamma", _B_xx+_B_lower); 165 165 return _B_xx+_B_lower; … … 177 177 178 178 while ((int)_B_xx>_B_upper) { 179 _B_k++;179 ++_B_k; 180 180 _B_lower = _B_upper+1; 181 181 _B_pow *= _B_s; … … 190 190 register int _B_nbits = 0; 191 191 192 while(!this->bit()) _B_nbits++;192 while(!this->bit()) ++_B_nbits; 193 193 if (count != NULL) { 194 194 *count += _B_nbits*2+1; … … 219 219 register int _B_logx; 220 220 _B_logx = gamma_decode(count); 221 _B_logx--;221 --_B_logx; 222 222 _B_xxx = binary_decode(1<<_B_logx, count); 223 _B_xxx--;223 --_B_xxx; 224 224 return (_B_xxx + (1<<_B_logx)); 225 225 } … … 241 241 do { 242 242 __code += __code + bit(); 243 if (count != NULL) (*count) ++;243 if (count != NULL) ++(*count); 244 244 } while (__code < *++__mclen); 245 245 … … 252 252 register int __clen = lens[x]; 253 253 register unsigned long __code = codes[x]; 254 for (__i=__clen-1; __i>=0; __i--) {254 for (__i=__clen-1; __i>=0; --__i) { 255 255 encodeBit((__code >> __i) & 1); 256 256 } … … 284 284 285 285 check_positive("bblock", _B_xx); 286 _B_xx--;286 --_B_xx; 287 287 while (_B_xx >= _B_bb) { 288 _B_xdivb++;288 ++_B_xdivb; 289 289 _B_xx -= _B_bb; 290 290 } … … 307 307 308 308 while ((int)(_B_xx)>_B_upper) { 309 _B_k++;309 ++_B_k; 310 310 _B_lower = _B_upper+1; 311 311 _B_pow *= _B_s; -
trunk/mgpp/lib/bitio_m_mem.cpp
r3365 r9612 43 43 if (remaining != 0) { 44 44 buffer = *pos++; 45 remaining --;45 --remaining; 46 46 } else { 47 47 buffer = 0xff; … … 60 60 if (remaining != 0) { 61 61 buffer = *pos++; 62 remaining --;62 --remaining; 63 63 } else { 64 64 buffer = 0x00; … … 81 81 } else { 82 82 buffer = *pos++; 83 remaining--;83 --remaining; 84 84 btg = sizeof(buffer) * 8; 85 85 } … … 90 90 91 91 void mem_bitio_buffer::encodeBit(int b) { 92 btg--;92 --btg; 93 93 if (b) buffer |= (1 << btg); 94 94 … … 96 96 if (remaining) { 97 97 *pos++ = buffer; 98 remaining--;98 --remaining; 99 99 } 100 100 buffer = 0; … … 107 107 if (remaining) { 108 108 *pos++ = buffer; 109 remaining--;109 --remaining; 110 110 } 111 111 } -
trunk/mgpp/lib/bitio_m_mems.cpp
r3365 r9612 46 46 { 47 47 b = b + b + (base[pos>>3] & (0x80 >> (pos & 0x07)) != 0); 48 pos ++;48 ++pos; 49 49 } 50 50 while(0); … … 60 60 int mems_bitio_buffer::bit() 61 61 { 62 pos ++;62 ++pos; 63 63 return ((base[(pos-1)>>3] & (0x80 >> ((pos-1) & 0x07))) != 0); 64 64 } … … 70 70 else 71 71 base[pos>>3] &= 0xff7f >> (pos & 0x07); 72 pos++;72 ++pos; 73 73 } 74 74 -
trunk/mgpp/lib/bitio_m_random.cpp
r8692 r9612 36 36 // make sure the length is a power of 2 37 37 while (len != 0) { 38 shift ++;38 ++shift; 39 39 len = len >> 1; 40 40 } … … 107 107 } 108 108 used = 1; 109 pos ++;109 ++pos; 110 110 111 111 if ((pos >> 3) >= len) … … 162 162 { 163 163 // fprintf(stderr, "Bit in"); 164 pos ++;164 ++pos; 165 165 if (((pos - 1) >> 3) >= len) 166 166 { -
trunk/mgpp/lib/bitio_m_stdio.cpp
r3365 r9612 82 82 void stdio_bitio_buffer::encodeBit(int b) 83 83 { 84 btg--;84 --btg; 85 85 if (b != 0) 86 86 buffer |= (1 << btg); -
trunk/mgpp/lib/local_strings.cpp
r3365 r9612 208 208 209 209 while (i < l && *++s1 == *++s2) 210 i++;210 ++i; 211 211 return (i); 212 212 } … … 283 283 284 284 memset (buf, '\0', sizeof(buf)); 285 for (i = 0; i < len; i++)285 for (i = 0; i < len; ++i) 286 286 { 287 287 strcpy (p, char2str (s[i])); … … 309 309 if (*s == '\\') 310 310 { 311 s++;311 ++s; 312 312 switch (*s++) 313 313 { 314 314 case '\0': 315 315 *d++ = '\\'; 316 s--;316 --s; 317 317 break; 318 318 case '\\': … … 402 402 403 403 str_base = str; 404 for (i = 0; i < len; i++)404 for (i = 0; i < len; ++i) 405 405 { 406 406 *str++ = *str255++; -
trunk/mgpp/lib/lovinstem.cpp
r3365 r9612 626 626 if (rule->end_group) 627 627 break; 628 rule++;628 ++rule; 629 629 } 630 630 } … … 1166 1166 } 1167 1167 } 1168 suffix_start++;1168 ++suffix_start; 1169 1169 } 1170 1170 while (not_done && ((ch1 = *suffix_start) != EOS)); -
trunk/mgpp/lib/mgheap.cpp
r3365 r9612 26 26 register int __i; \ 27 27 register char *__a = (a), *__b = (b); \ 28 for (__i = (s); __i; __i--) \28 for (__i = (s); __i; --__i) \ 29 29 { \ 30 30 register char __t = *__a; \ … … 39 39 register int __i; \ 40 40 register char *__dst = (dst), *__src = (src); \ 41 for (__i = (s); __i; __i--) \41 for (__i = (s); __i; --__i) \ 42 42 *__dst++ = *__src++; \ 43 43 } while(0) … … 53 53 if (child < num && hc ((char *) heap + child * size, 54 54 (char *) heap + child * size - size) < 0) 55 child++;55 ++child; 56 56 if (hc ((char *) heap + (curr - 1) * size, (char *) heap + (child - 1) * size) > 0) 57 57 { … … 91 91 { 92 92 register int i; 93 for (i = num / 2; i > 0; i--)93 for (i = num / 2; i > 0; --i) 94 94 heap_heapify (heap, size, num, i, hc); 95 95 } … … 111 111 { 112 112 register int i; 113 for (i = num; i > 1; i--)113 for (i = num; i > 1; --i) 114 114 { 115 115 SWAP (size, (char *) heap, (char *) heap + (i - 1) * size); … … 122 122 heap_deletehead (void *heap, int size, int *num, heap_comp hc) 123 123 { 124 (*num)--;124 --(*num); 125 125 SWAP (size, (char *) heap, (char *) heap + *num * size); 126 126 heap_heapify (heap, size, *num, 1, hc); … … 144 144 heap_additem (void *heap, int size, int *num, heap_comp hc) 145 145 { 146 (*num)++;146 ++(*num); 147 147 heap_pullup (heap, size, *num, hc); 148 148 } -
trunk/mgpp/lib/perf_hash.cpp
r3365 r9612 213 213 Stack[StackPos].v = v; 214 214 Stack[StackPos].m = 0; 215 StackPos++;215 ++StackPos; 216 216 while (StackPos) 217 217 { 218 218 int m, b; 219 StackPos--;219 --StackPos; 220 220 e = Stack[StackPos].e; 221 221 v = Stack[StackPos].v; … … 277 277 /* build list of edges for each node */ 278 278 for (v = 1; v <= n; FIRST[v++] = 0); 279 for (e = 1; e <= m; e++)279 for (e = 1; e <= m; ++e) 280 280 { 281 281 NEXT[A + e] = FIRST[NODEa[e]]; … … 293 293 S.sp = 0; /* empty the stack */ 294 294 mk[0] = ERASED; /* a sentinel for the test below */ 295 for (v = 1; v <= n; v++)295 for (v = 1; v <= n; ++v) 296 296 { 297 297 if (mk[e = norm (unique (v))] == MEMBER) … … 324 324 *n = (int) (num * c + 1); 325 325 /* initialize tables of random integers */ 326 for (i = 0; i < MAX_CH; i++)327 for (j = 0; j < MAX_L; j++)326 for (i = 0; i < MAX_CH; ++i) 327 for (j = 0; j < MAX_L; ++j) 328 328 { 329 329 #ifndef STRUCT … … 340 340 341 341 /* compute an edge (NODEa[e], NODEb[e], NODEc[e]) for each word */ 342 for (e = 1; e <= num; e++)342 for (e = 1; e <= num; ++e) 343 343 { 344 344 /*generate an edge corresponding to the ith word */ … … 363 363 if (++j >= MAX_L) 364 364 j = 0; 365 w++;365 ++w; 366 366 } 367 367 while (--l); … … 460 460 461 461 /*for each word compute its place in hash table and check if correct */ 462 for (e = 1; e <= m; e++)462 for (e = 1; e <= m; ++e) 463 463 { 464 464 if ((e - 1) != (g[NODEa[e]] ^ g[NODEb[e]] ^ g[NODEc[e]])) … … 538 538 printf ("#define _HFM %d\n#define _HXL %d\n", m, MAX_L); 539 539 printf ("#define _HFA %d\n\nstatic int g[_HFN] = {\n", lc - fc + 1); 540 for (i = 1; i < n; i++)540 for (i = 1; i < n; ++i) 541 541 { 542 542 if (i % 8 == 0) … … 547 547 548 548 printf ("static int mt1[_HFA][_HXL] = {\n"); 549 for (j = fc; j < lc; j++)549 for (j = fc; j < lc; ++j) 550 550 { 551 551 printf ("{"); 552 for (i = 0; i < MAX_L - 1; i++)552 for (i = 0; i < MAX_L - 1; ++i) 553 553 printf ("%*d,", w, tb0[j][i]); 554 554 printf ("%*d},\n", w, tb0[j][MAX_L - 1]); 555 555 } 556 556 printf ("{"); 557 for (i = 0; i < MAX_L - 1; i++)557 for (i = 0; i < MAX_L - 1; ++i) 558 558 printf ("%*d,", w, tb0[lc][i]); 559 559 printf ("%*d}\n", w, tb0[lc][MAX_L - 1]); … … 561 561 562 562 printf ("static int mt2[_HFA][_HXL] = {\n"); 563 for (j = fc; j < lc; j++)563 for (j = fc; j < lc; ++j) 564 564 { 565 565 printf ("{"); 566 for (i = 0; i < MAX_L - 1; i++)566 for (i = 0; i < MAX_L - 1; ++i) 567 567 printf ("%*d,", w, tb1[j][i]); 568 568 printf ("%*d},\n", w, tb1[j][MAX_L - 1]); 569 569 } 570 570 printf ("{"); 571 for (i = 0; i < MAX_L - 1; i++)571 for (i = 0; i < MAX_L - 1; ++i) 572 572 printf ("%*d,", w, tb1[lc][i]); 573 573 printf ("%*d}\n", w, tb1[lc][MAX_L - 1]); … … 575 575 576 576 printf ("static int mt3[_HFA][_HXL] = {\n"); 577 for (j = fc; j < lc; j++)577 for (j = fc; j < lc; ++j) 578 578 { 579 579 printf ("{"); 580 for (i = 0; i < MAX_L - 1; i++)580 for (i = 0; i < MAX_L - 1; ++i) 581 581 printf ("%*d,", w, tb2[j][i]); 582 582 printf ("%*d},\n", w, tb2[j][MAX_L - 1]); 583 583 } 584 584 printf ("{"); 585 for (i = 0; i < MAX_L - 1; i++)585 for (i = 0; i < MAX_L - 1; ++i) 586 586 printf ("%*d,", w, tb2[lc][i]); 587 587 printf ("%*d}\n", w, tb2[lc][MAX_L - 1]); … … 606 606 607 607 MAX_L = 1; 608 for (i = 0; i < num; i++)608 for (i = 0; i < num; ++i) 609 609 { 610 610 unsigned len = keys[i][0]; 611 611 u_char *s = keys[i] + 1; 612 for (; len; len--, s++)612 for (; len; len--, ++s) 613 613 translate[*s] = 1; 614 614 if (i) … … 621 621 } 622 622 j = 0; 623 for (i = 0; i < 256; i++)623 for (i = 0; i < 256; ++i) 624 624 if (translate[i]) 625 625 translate[i] = j++; … … 657 657 Xfree (g); 658 658 #ifndef STRUCT 659 for (i = 0; i < MAX_CH; i++)659 for (i = 0; i < MAX_CH; ++i) 660 660 { 661 661 if (tb0 && tb0[i]) … … 673 673 Xfree (tb2); 674 674 #else 675 for (i = 0; i < MAX_CH; i++)675 for (i = 0; i < MAX_CH; ++i) 676 676 if (tb && tb[i]) 677 677 Xfree (tb[i]); … … 697 697 tb1 = Xmalloc (sizeof (int *) * MAX_CH); 698 698 tb2 = Xmalloc (sizeof (int *) * MAX_CH); 699 for (i = 0; i < MAX_CH; i++)699 for (i = 0; i < MAX_CH; ++i) 700 700 { 701 701 if (tb0) … … 718 718 #else 719 719 tb = (tb_entry **)Xmalloc (sizeof (struct tb_entry *) * MAX_CH); 720 for (i = 0; i < MAX_CH; i++)720 for (i = 0; i < MAX_CH; ++i) 721 721 if (tb) 722 722 if (!(tb[i] = (tb_entry *)Xmalloc (sizeof (struct tb_entry) * MAX_L))) … … 809 809 810 810 /* [RPAP - Jan 97: Endian Ordering] */ 811 for (i = 0; i < phd->MAX_N + 1; i++)811 for (i = 0; i < phd->MAX_N + 1; ++i) 812 812 HTONSI(phd->g[i]); 813 813 … … 815 815 816 816 /* [RPAP - Jan 97: Endian Ordering] */ 817 for (i = 0; i < phd->MAX_N + 1; i++)817 for (i = 0; i < phd->MAX_N + 1; ++i) 818 818 NTOHSI(phd->g[i]); 819 819 820 820 #ifndef STRUCT 821 for (i = 0; i < phd->MAX_CH; i++)821 for (i = 0; i < phd->MAX_CH; ++i) 822 822 { 823 823 /* [RPAP - Jan 97: Endian Ordering] */ 824 824 int j; 825 for (j = 0; j < phd->MAX_L; j++)825 for (j = 0; j < phd->MAX_L; ++j) 826 826 { 827 827 HTONSI(phd->tb0[i][j]); … … 838 838 839 839 /* [RPAP - Jan 97: Endian Ordering] */ 840 for (j = 0; j < phd->MAX_L; j++)840 for (j = 0; j < phd->MAX_L; ++j) 841 841 { 842 842 NTOHSI(phd->tb0[i][j]); … … 846 846 } 847 847 #else 848 for (i = 0; i < phd->MAX_CH; i++)848 for (i = 0; i < phd->MAX_CH; ++i) 849 849 { 850 850 /* [RPAP - Jan 97: Endian Ordering] */ 851 851 int j; 852 for (j = 0; j < phd->MAX_L; j++)852 for (j = 0; j < phd->MAX_L; ++j) 853 853 { 854 854 HTONSL(phd->tb[i][j].tb0); … … 861 861 862 862 /* [RPAP - Jan 97: Endian Ordering] */ 863 for (j = 0; j < phd->MAX_L; j++)863 for (j = 0; j < phd->MAX_L; ++j) 864 864 { 865 865 NTOHSL(phd->tb[i][j].tb0); … … 899 899 phd->tb1 = Xmalloc (sizeof (int *) * phd->MAX_CH); 900 900 phd->tb2 = Xmalloc (sizeof (int *) * phd->MAX_CH); 901 for (i = 0; i < phd->MAX_CH; i++)901 for (i = 0; i < phd->MAX_CH; ++i) 902 902 { 903 903 if (phd->tb0) … … 917 917 if (phd->g) 918 918 Xfree (phd->g); 919 for (i = 0; i < MAX_CH; i++)919 for (i = 0; i < MAX_CH; ++i) 920 920 { 921 921 if (phd->tb0 && phd->tb0[i]) … … 939 939 940 940 /* [RPAP - Jan 97: Endian Ordering] */ 941 for (i = 0; i < phd->MAX_N + 1; i++)941 for (i = 0; i < phd->MAX_N + 1; ++i) 942 942 NTOHSI(phd->g[i]); 943 943 944 for (i = 0; i < phd->MAX_CH; i++)944 for (i = 0; i < phd->MAX_CH; ++i) 945 945 { 946 946 int j; … … 954 954 955 955 /* [RPAP - Jan 97: Endian Ordering] */ 956 for (j = 0; j < phd->MAX_L; j++)956 for (j = 0; j < phd->MAX_L; ++j) 957 957 { 958 958 NTOHSI(phd->tb0[i][j]); … … 963 963 #else 964 964 phd->tb = (struct tb_entry **)Xmalloc (sizeof (struct tb_entry *) * phd->MAX_CH); 965 for (i = 0; i < phd->MAX_CH; i++)965 for (i = 0; i < phd->MAX_CH; ++i) 966 966 if (phd->tb) 967 967 if (!(phd->tb[i] = (struct tb_entry *)Xmalloc (sizeof (struct tb_entry) * phd->MAX_L))) … … 973 973 if (phd->g) 974 974 Xfree (phd->g); 975 for (i = 0; i < MAX_CH; i++)975 for (i = 0; i < MAX_CH; ++i) 976 976 if (phd->tb && phd->tb[i]) 977 977 Xfree (phd->tb[i]); … … 985 985 986 986 /* [RPAP - Jan 97: Endian Ordering] */ 987 for (i = 0; i < phd->MAX_N + 1; i++)987 for (i = 0; i < phd->MAX_N + 1; ++i) 988 988 NTOHSI(phd->g[i]); 989 989 990 for (i = 0; i < phd->MAX_CH; i++)990 for (i = 0; i < phd->MAX_CH; ++i) 991 991 { 992 992 int j; … … 996 996 997 997 /* [RPAP - Jan 97: Endian Ordering] */ 998 for (j = 0; j < phd->MAX_L; j++)998 for (j = 0; j < phd->MAX_L; ++j) 999 999 { 1000 1000 NTOHSL(phd->tb[i][j].tb0); … … 1015 1015 if (phd->g) 1016 1016 Xfree (phd->g); 1017 for (i = 0; i < phd->MAX_CH; i++)1017 for (i = 0; i < phd->MAX_CH; ++i) 1018 1018 if (phd->tb && phd->tb[i]) 1019 1019 Xfree (phd->tb[i]); … … 1051 1051 if (++i >= phd->MAX_L) 1052 1052 i = 0; 1053 l--;1054 s++;1053 --l; 1054 ++s; 1055 1055 } 1056 1056 if (u == v && ++v >= phd->MAX_N) -
trunk/mgpp/lib/simplefrenchstem.cpp
r3365 r9612 46 46 wordstart[last-1]='l'; 47 47 } 48 last--;48 --last; 49 49 50 50 } else { 51 if (last>=0 && wordstart[last]=='s') last--;52 if (last>=0 && wordstart[last]=='r') last--;53 if (last>=0 && wordstart[last]=='e') last--;51 if (last>=0 && wordstart[last]=='s') --last; 52 if (last>=0 && wordstart[last]=='r') --last; 53 if (last>=0 && wordstart[last]=='e') --last; 54 54 55 55 /* letter with accent e + ' -- there are two possible encodings */ 56 56 if (last>=0 && wordstart[last]==0xe9) { 57 last--;57 --last; 58 58 } else if (last>=1 && wordstart[last-1]=='e' && wordstart[last]==0x301) { 59 59 last -= 2; 60 60 } 61 61 62 if (last >= 1 && wordstart[last]==wordstart[last-1]) last--;62 if (last >= 1 && wordstart[last]==wordstart[last-1]) --last; 63 63 } /* end else */ 64 64 -
trunk/mgpp/lib/strstr.cpp
r3365 r9612 29 29 char *s = s1; 30 30 31 for (p2 = s2, i = 0; *s; p2 = s2, i++, s++)31 for (p2 = s2, i = 0; *s; p2 = s2, ++i, ++s) 32 32 { 33 for (p1 = s; *p1 && *p2 && *p1 == *p2; p1++, p2++)33 for (p1 = s; *p1 && *p2 && *p1 == *p2; ++p1, ++p2) 34 34 ; 35 35 if (!*p2) -
trunk/mgpp/lib/unitool.cpp
r3365 r9612 1419 1419 if (leninc > 1) { 1420 1420 /* we have to shift the array along */ 1421 for (i=curlen-1; i>=curpos; i--) {1421 for (i=curlen-1; i>=curpos; --i) { 1422 1422 input[i+leninc] = input[i]; 1423 1423 } … … 1427 1427 1428 1428 /* decompose the character */ 1429 for (i=0; i<=leninc; i++) {1429 for (i=0; i<=leninc; ++i) { 1430 1430 input[curpos+i] = decompose_info[tablepos].str[i]; 1431 1431 } … … 1441 1441 } else { 1442 1442 /* the character cannot be decomposed */ 1443 curpos++;1443 ++curpos; 1444 1444 } 1445 1445 } … … 1487 1487 min_value = 0; /* 00 */ 1488 1488 1489 while (letter_here < letter_end && letter_here->last < i) letter_here++;1489 while (letter_here < letter_end && letter_here->last < i) ++letter_here; 1490 1490 if (letter_here < letter_end && letter_here->last <= min_end) { 1491 1491 min_start = letter_here->first; … … 1494 1494 } 1495 1495 1496 while (digit_here < digit_end && digit_here->last < i) digit_here++;1496 while (digit_here < digit_end && digit_here->last < i) ++digit_here; 1497 1497 if (digit_here < digit_end && digit_here->last <= min_end) { 1498 1498 min_start = digit_here->first; … … 1501 1501 } 1502 1502 1503 while (space_here < space_end && space_here->last < i) space_here++;1503 while (space_here < space_end && space_here->last < i) ++space_here; 1504 1504 if (space_here < space_end && space_here->last <= min_end) { 1505 1505 min_start = space_here->first; … … 1530 1530 unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 1531 1531 (min_value & mask); 1532 i++;1532 ++i; 1533 1533 } 1534 1534 } … … 1616 1616 /* keep going till you find the null-terminator */ 1617 1617 while (*str != 0) { 1618 len++;1619 str++;1618 ++len; 1619 ++str; 1620 1620 } 1621 1621 … … 1629 1629 /* keep going till you find the null-terminator */ 1630 1630 while (*str != 0 && len < max_length ) { 1631 len++;1632 str++;1631 ++len; 1632 ++str; 1633 1633 } 1634 1634 … … 1713 1713 /* store the character */ 1714 1714 *outhere = c; 1715 outhere++;1716 outlen++;1715 ++outhere; 1716 ++outlen; 1717 1717 } 1718 1718 } … … 1747 1747 outhere += clen; 1748 1748 outlen += clen; 1749 in_i++;1749 ++in_i; 1750 1750 } 1751 1751
Note:
See TracChangeset
for help on using the changeset viewer.