X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Flibc-extension.cc;h=1b8060cde2f14f6dfb86d38173eb527143d3dae6;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=7b33b0430e399cd719bba75201ea940cecbeb74e;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc index 7b33b0430e..1b8060cde2 100644 --- a/flower/libc-extension.cc +++ b/flower/libc-extension.cc @@ -1,10 +1,21 @@ /* - libc-extension.cc -- compensate for lacking libc functions. + This file is part of LilyPond, the GNU music typesetter. - source file of the flowerlib - - (c) 1997--2006 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include @@ -23,7 +34,7 @@ strnlwr (char *start, int n) char *p = start + n; while (--p >= start) { - *p = tolower (*p); /* a macro on some compilers */ + *p = (char)tolower (*p); /* a macro on some compilers */ } return start; } @@ -34,7 +45,7 @@ strnupr (char *start, int n) char *p = start + n; while (--p >= start) { - *p = toupper (*p); /* a macro on some compilers */ + *p = (char)toupper (*p); /* a macro on some compilers */ } return start; } @@ -49,7 +60,7 @@ strnupr (char *start, int n) unsigned char * _memmem (unsigned char const *haystack, int haystack_len, - unsigned char const *needle, int needle_len) + unsigned char const *needle, int needle_len) { unsigned char const *end_haystack = haystack + haystack_len - needle_len + 1; unsigned char const *end_needle = needle + needle_len; @@ -61,12 +72,12 @@ _memmem (unsigned char const *haystack, int haystack_len, unsigned char const *subneedle = needle; unsigned char const *subhaystack = haystack; while (subneedle < end_needle) - if (*subneedle++ != *subhaystack++) - goto next; + if (*subneedle++ != *subhaystack++) + goto next; /* Completed the needle. Gotcha. */ return (unsigned char *) haystack; - next: +next: haystack++; } return 0; @@ -74,7 +85,7 @@ _memmem (unsigned char const *haystack, int haystack_len, void * memmem (void const *haystack, int haystack_len, - void const *needle, int needle_len) + void const *needle, int needle_len) { unsigned char const *haystack_byte_c = (unsigned char const *)haystack; unsigned char const *needle_byte_c = (unsigned char const *)needle; @@ -90,7 +101,7 @@ memrchr (unsigned char const *p, int n, char c) while (q > p) { if (*--q == c) - return (unsigned char *)q; + return (unsigned char *)q; } return 0; } @@ -122,17 +133,17 @@ memrev (unsigned char *byte, int length) double my_round (double x) { - return floor (x -0.5)+ 1.0; + return floor (x - 0.5) + 1.0; } /* namespace std { */ - + #ifndef isinf #if !HAVE_ISINF int isinf (double x) { - return x && (x == x/ 2); + return x && (x == x / 2); } #endif #endif