Procházet zdrojové kódy

Made errors print to stderr so eval wont try to evaluate them

naelstrof před 11 roky
rodič
revize
755a6cfa00
3 změnil soubory, kde provedl 13 přidání a 13 odebrání
  1. 1
    1
      main.cpp
  2. 10
    10
      options.cpp
  3. 2
    2
      x.cpp

+ 1
- 1
main.cpp Zobrazit soubor

36
             printf( "Y=0\n" );
36
             printf( "Y=0\n" );
37
             printf( "W=0\n" );
37
             printf( "W=0\n" );
38
             printf( "H=0\n" );
38
             printf( "H=0\n" );
39
-            printf( "User right-clicked. Canceled selection.\n" );
39
+            fprintf( stderr, "User right-clicked. Canceled selection.\n" );
40
             state = -1;
40
             state = -1;
41
             running = false;
41
             running = false;
42
         }
42
         }

+ 10
- 10
options.cpp Zobrazit soubor

61
             if ( i == 0 ) {
61
             if ( i == 0 ) {
62
                 continue;
62
                 continue;
63
             }
63
             }
64
-            printf( "Error: Unknown argument %s\n", argv[i] );
65
-            printf( "Try -h or --help for help.\n" );
64
+            fprintf( stderr, "Error: Unknown argument %s\n", argv[i] );
65
+            fprintf( stderr, "Try -h or --help for help.\n" );
66
             return 1;
66
             return 1;
67
         }
67
         }
68
     }
68
     }
79
     char* x = new char[ arg.size() ];
79
     char* x = new char[ arg.size() ];
80
     int num = sscanf( copy.c_str(), "%s %i", x, returnInt );
80
     int num = sscanf( copy.c_str(), "%s %i", x, returnInt );
81
     if ( num != 2 ) {
81
     if ( num != 2 ) {
82
-        printf( "Error parsing command arguments near %s\n", arg.c_str() );
83
-        printf( "Usage: %s=INT\n", x );
84
-        printf( "Example: %s=10 or %s=-12\n", x, x );
85
-        printf( "Try -h or --help for help.\n" );
82
+        fprintf( stderr, "Error parsing command arguments near %s\n", arg.c_str() );
83
+        fprintf( stderr, "Usage: %s=INT\n", x );
84
+        fprintf( stderr, "Example: %s=10 or %s=-12\n", x, x );
85
+        fprintf( stderr, "Try -h or --help for help.\n" );
86
         delete[] x;
86
         delete[] x;
87
         return 1;
87
         return 1;
88
     }
88
     }
109
     char* y = new char[ arg.size() ];
109
     char* y = new char[ arg.size() ];
110
     int num = sscanf( copy.c_str(), "%s %s", x, y );
110
     int num = sscanf( copy.c_str(), "%s %s", x, y );
111
     if ( num != 2 ) {
111
     if ( num != 2 ) {
112
-        printf( "Error parsing command arguments near %s\n", arg.c_str() );
113
-        printf( "Usage: %s=STRING\n", x );
114
-        printf( "Example: %s=:0 or %s=hostname:0.1\n", x, x );
115
-        printf( "Try -h or --help for help.\n" );
112
+        fprintf( stderr, "Error parsing command arguments near %s\n", arg.c_str() );
113
+        fprintf( stderr, "Usage: %s=STRING\n", x );
114
+        fprintf( stderr, "Example: %s=:0 or %s=hostname:0.1\n", x, x );
115
+        fprintf( stderr, "Try -h or --help for help.\n" );
116
         delete[] x;
116
         delete[] x;
117
         delete[] y;
117
         delete[] y;
118
         return 1;
118
         return 1;

+ 2
- 2
x.cpp Zobrazit soubor

53
     // Initialize display
53
     // Initialize display
54
     m_display = XOpenDisplay( display.c_str() );
54
     m_display = XOpenDisplay( display.c_str() );
55
     if ( !m_display ) {
55
     if ( !m_display ) {
56
-        printf( "Failed to open X display %s\n", display.c_str() );
56
+        fprintf( stderr, "Error: Failed to open X display %s\n", display.c_str() );
57
         return 1;
57
         return 1;
58
     }
58
     }
59
     m_screen    = ScreenOfDisplay( m_display, DefaultScreen( m_display ) );
59
     m_screen    = ScreenOfDisplay( m_display, DefaultScreen( m_display ) );
74
                             PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
74
                             PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
75
                             GrabModeAsync, GrabModeAsync, m_root, xfontcursor, CurrentTime );
75
                             GrabModeAsync, GrabModeAsync, m_root, xfontcursor, CurrentTime );
76
     if ( err != GrabSuccess ) {
76
     if ( err != GrabSuccess ) {
77
-        printf( "Failed to grab X cursor.\n" );
77
+        fprintf( stderr, "Error: Failed to grab X cursor.\n" );
78
         return 1;
78
         return 1;
79
     }
79
     }
80
 
80