1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- util/bsetroot.cc.orig 2005-03-15 07:01:37 UTC
+++ util/bsetroot.cc
@@ -28,6 +28,7 @@
#include <Texture.hh>
#include <cctype>
+#include <cstdlib>
#include <X11/Xatom.h>
#include <stdio.h>
@@ -68,11 +69,11 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_na
} else if (! strcmp("-mod", argv[i])) {
if ((++i) >= argc) usage();
- mod_x = atoi(argv[i]);
+ mod_x = std::atoi(argv[i]);
if ((++i) >= argc) usage();
- mod_y = atoi(argv[i]);
+ mod_y = std::atoi(argv[i]);
if (mod_x < 1) mod_x = 1;
if (mod_y < 1) mod_y = 1;
@@ -336,7 +337,7 @@ void bsetroot::usage(int exit_code) {
" -to <color> gradient end color\n\n"
" -solid <color> solid color\n\n"
" -help print this help text and exit\n");
- exit(exit_code);
+ std::exit(exit_code);
}
int main(int argc, char **argv) {
@@ -350,7 +351,7 @@ int main(int argc, char **argv) {
if ((++i) >= argc) {
fprintf(stderr, "error: '-display' requires an argument\n");
- ::exit(1);
+ std::exit(1);
}
display_name = argv[i];
|
