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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.123 by root, Wed Dec 21 10:35:47 2005 UTC vs.
Revision 1.125 by root, Wed Dec 21 19:50:16 2005 UTC

33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
369 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
371 } 373 }
372 374
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, std::numeric_limits<int16_t>::max ());
375 377
376#if ENABLE_FRILLS 378#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 387#endif
384 388
385#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 391 pointerBlankDelay = i;
521 525
522 /* avoiding the math library: 526 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 529 ;
526 MAX_IT (i, 1); 530 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 532
529 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]); 534 (unsigned int)parent[0]);
531 535

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines