Changeset 554601

Timestamp:

12/28/11 15:45:07 (17 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

44e5b81a909587475868949602bb06e09d9354f1

Parents:

b6fb5ce106ed038b516319e81b7117b7a36ec8ac

git-author:

Stefan Persson <stefan.persson@telldus.se>2011-12-28 15:45:07+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2011-12-28 15:45:07+01:00

Message:

Tdtool exiting with error codes on failures. Closes #146.

Location:

telldus-core

Files:

• client/telldus-core.h (modified) (1 diff)
• tdtool/main.cpp (modified) (13 diffs)

telldus-core/client/telldus-core.h

@@ -116 +116 @@
 #define TELLSTICK_ERROR_CONNECTING_SERVICE -6
 #define TELLSTICK_ERROR_UNKNOWN_RESPONSE -7
+#define TELLSTICK_ERROR_SYNTAX -8
 #define TELLSTICK_ERROR_UNKNOWN -99
 

telldus-core/tdtool/main.cpp

@@ -79 +79 @@
 
 void print_device( int index ) {
+        tdInit();
         int intId = tdGetDeviceId(index);
         char *name = tdGetName(intId);
@@ -103 +104 @@
 }
 
-void list_devices() {
+int list_devices() {
+        tdInit();
         int intNum = tdGetNumberOfDevices();
         if (intNum < 0) {
@@ -109 +111 @@
                 fprintf(stderr, "Error fetching devices: %s\n", errorString);
                 tdReleaseString(errorString);
-                return;
+                return intNum;
         }
         printf("Number of devices: %i\n", intNum);
@@ -155 +157 @@
                 fprintf(stderr, "Error fetching sensors: %s\n", errorString);
                 tdReleaseString(errorString);
-                return;
-        }
+                return sensorStatus;
+        }
+        return TELLSTICK_SUCCESS;
 }
 
 int find_device( char *device ) {
+        tdInit();
         int deviceId = atoi(device);
         if (deviceId == 0) { //Try to find the id from the name
@@ -179 +183 @@
 }
 
-void switch_device( bool turnOn, char *device ) {
+int switch_device( bool turnOn, char *device ) {
+        tdInit();
         int deviceId = find_device( device );
         if (deviceId == 0) {
                 printf("Device '%s', not found!\n", device);
-                return;
+                return TELLSTICK_ERROR_DEVICE_NOT_FOUND;
         }
 
@@ -200 +205 @@
         printf(" - %s\n", errorString);
         tdReleaseString(errorString);
-}
-
-void dim_device( char *device, int level ) {
+        return retval;
+}
+
+int dim_device( char *device, int level ) {
+        tdInit();
         int deviceId = find_device( device );
         if (deviceId == 0) {
                 printf("Device '%s', not found!\n", device);
-                return;
+                return TELLSTICK_ERROR_DEVICE_NOT_FOUND;
         }
         if (level < 0 || level > 255) {
                 printf("Level %i out of range!\n", level);
-                return;
+                return TELLSTICK_ERROR_SYNTAX;
         }
 
@@ -219 +226 @@
         tdReleaseString(name);
         tdReleaseString(errorString);
-}
-
-void bell_device( char *device ) {
+        return retval;
+}
+
+int bell_device( char *device ) {
+        tdInit();
         int deviceId = find_device( device );
         if (deviceId == 0) {
                 printf("Device '%s', not found!\n", device);
-                return;
+                return TELLSTICK_ERROR_DEVICE_NOT_FOUND;
         }
 
@@ -234 +243 @@
         tdReleaseString(name);
         tdReleaseString(errorString);
-}
-
-void learn_device( char *device ) {
+        return retval;
+}
+
+int learn_device( char *device ) {
+        tdInit();
         int deviceId = find_device( device );
         if (deviceId == 0) {
                 printf("Device '%s', not found!\n", device);
-                return;
+                return TELLSTICK_ERROR_DEVICE_NOT_FOUND;
         }
 
@@ -249 +260 @@
         tdReleaseString(name);
         tdReleaseString(errorString);
-}
-
-void send_raw_command( char *command ) {
+        return retval;
+}
+
+int send_raw_command( char *command ) {
+        tdInit();
         const int MAX_LENGTH = 100;
         char msg[MAX_LENGTH];
@@ -263 +276 @@
                 if (fd == NULL) {
                         printf("Error opening file %s\n", command);
-                        return;
+                        return TELLSTICK_ERROR_UNKNOWN;
                 }
                 fgets(msg, MAX_LENGTH, fd);
@@ -272 +285 @@
         printf("Sending raw command: %s\n", errorString);
         tdReleaseString(errorString);
+        return retval;
 }
 
@@ -295 +309 @@
         if (argc < 2) {
                 print_usage( argv[0] );
-                return -1;
-        }
-
-        while ( (optch = getopt_long(argc,argv,optstring,long_opts,&longindex)) != -1 )
+                return -TELLSTICK_ERROR_SYNTAX;
+        }
+
+        int returnSuccess = 0;
+        while ( (optch = getopt_long(argc,argv,optstring,long_opts,&longindex)) != -1 ){
+                int success = 0;
                 switch (optch) {
                         case 'b' :
-                                bell_device( &optarg[0] );
+                                success = bell_device( &optarg[0] );
                                 break;
                         case 'd' :
                                 if (level >= 0) {
-                                        dim_device( &optarg[0], level );
+                                        success = dim_device( &optarg[0], level );
+                                        break;
                                 }
+                                printf("Dim level missing or incorrect value.\n");
+                                success = TELLSTICK_ERROR_SYNTAX;
                                 break;
                         case 'f' :
-                                switch_device(false, &optarg[0]);
+                                success = switch_device(false, &optarg[0]);
                                 break;
                         case 'h' :
                                 print_usage( argv[0] );
-                                break;
+                                success = TELLSTICK_SUCCESS;
                         case 'i' :
                                 print_version( );
-                                break;
+                                success = TELLSTICK_SUCCESS;
                         case 'l' :
-                                list_devices();
+                                success = list_devices();
                                 break;
                         case 'n' :
-                                switch_device(true, &optarg[0]);
+                                success = switch_device(true, &optarg[0]);
                                 break;
                         case 'e' :
-                                learn_device(&optarg[0]);
+                                success = learn_device(&optarg[0]);
                                 break;
                         case 'r' :
-                                send_raw_command(&optarg[0]);
+                                success = send_raw_command(&optarg[0]);
                                 break;
                         case 'v' :
@@ -334 +353 @@
                         default :
                                 print_usage( argv[0] );
-                                return -1;
-                }
-
+                                success = TELLSTICK_ERROR_SYNTAX;
+                }
+                if(success != TELLSTICK_SUCCESS){
+                        returnSuccess = success;  //return last error message
+                }
+        }
         tdClose(); //Cleaning up
-        return 0;
-}
+        return -returnSuccess;
+}