ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.C (file contents):
Revision 1.11 by root, Mon Jan 3 03:05:47 2011 UTC vs.
Revision 1.15 by sf-exg, Thu Jun 2 13:07:28 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtutil.C 2 * File: rxvtutil.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include <cstdlib> 23#include <cstdlib>
24#include <cstring> 24#include <cstring>
25#include <inttypes.h>
26 25
27#include "rxvtutil.h" 26#include "rxvtutil.h"
28
29#if !HAVE_GCC_BUILTINS
30int rxvt_ctz (unsigned int x) CONST
31{
32 int r = 0;
33
34 x &= -x; // this isolates the lowest bit
35
36 if (x & 0xaaaaaaaa) r += 1;
37 if (x & 0xcccccccc) r += 2;
38 if (x & 0xf0f0f0f0) r += 4;
39 if (x & 0xff00ff00) r += 8;
40 if (x & 0xffff0000) r += 16;
41
42 return r;
43}
44
45int rxvt_popcount (unsigned int x) CONST
46{
47 x -= (x >> 1) & 0x55555555;
48 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
49 x = ((x >> 4) + x) & 0x0f0f0f0f;
50 x *= 0x01010101;
51
52 return x >> 24;
53}
54#endif
55 27
56void * 28void *
57zero_initialized::operator new (size_t s) 29zero_initialized::operator new (size_t s)
58{ 30{
59 void *p = malloc (s); 31 void *p = malloc (s);
… …
74void * 46void *
75rxvt_temp_buf (int len) 47rxvt_temp_buf (int len)
76{ 48{
77 if (len > temp_len) 49 if (len > temp_len)
78 { 50 {
51 free (temp_buf);
79 temp_buf = realloc (temp_buf, len); 52 temp_buf = malloc (len);
80 temp_len = len; 53 temp_len = len;
81 } 54 }
82 55
83 return temp_buf; 56 return temp_buf;
84} 57}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines