From 3a04aedf595eb6add85e3f0d5dc9e6829bf00b03 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Tue, 10 Apr 2012 21:19:58 +0200 Subject: [PATCH] Changed domain to rscada.se Changed exit code for errors --- bin/Makefile.am | 6 +++--- bin/mbus-serial-request-data.c | 22 +++++++++++----------- bin/mbus-serial-scan-secondary.c | 12 ++++++------ bin/mbus-serial-scan.c | 12 ++++++------ bin/mbus-serial-select-secondary.c | 22 +++++++++++----------- bin/mbus-serial-switch-baudrate.c | 14 +++++++------- bin/mbus-tcp-request-data.c | 20 ++++++++++---------- bin/mbus-tcp-scan-secondary.c | 10 +++++----- bin/mbus-tcp-scan.c | 10 +++++----- bin/mbus-tcp-select-secondary.c | 20 ++++++++++---------- bin/mbus_serial_scan.c | 10 ++++++++++ mbus/Makefile.am | 6 +++--- mbus/Makefile.in | 6 +++--- mbus/mbus-protocol-aux.c | 6 +++--- mbus/mbus-protocol-aux.h | 6 +++--- mbus/mbus-protocol.c | 7 +++---- mbus/mbus-protocol.h | 6 +++--- mbus/mbus-serial.c | 6 +++--- mbus/mbus-serial.h | 6 +++--- mbus/mbus-tcp.c | 7 +++---- mbus/mbus-tcp.h | 6 +++--- mbus/mbus.c | 6 +++--- mbus/mbus.h | 8 ++++---- test/Makefile.am | 6 +++--- test/mbus_parse.c | 10 +++++----- test/mbus_parse_hex.c | 8 ++++---- test/mbus_unit_test1.c | 6 +++--- 27 files changed, 136 insertions(+), 128 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index ca63f80..e525a3c 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -2,9 +2,9 @@ # Copyright (C) 2010, Raditex AB # All rights reserved. # -# FreeSCADA -# http://www.FreeSCADA.com -# freescada@freescada.com +# rSCADA +# http://www.rSCADA.se +# info@rscada.se # # ------------------------------------------------------------------------------ PACKAGE = @PACKAGE@ diff --git a/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c index 9544a79..d7facfc 100644 --- a/bin/mbus-serial-request-data.c +++ b/bin/mbus-serial-request-data.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -67,13 +67,13 @@ main(int argc, char **argv) if ((handle = mbus_connect_serial(device)) == NULL) { fprintf(stderr, "Failed to setup connection to M-bus gateway\n"); - return -1; + return 1; } if (mbus_serial_set_baudrate(handle->m_serial_handle, baudrate) == -1) { printf("Failed to set baud rate.\n"); - return -1; + return 1; } @@ -88,24 +88,24 @@ main(int argc, char **argv) if (probe_ret == MBUS_PROBE_COLLISION) { fprintf(stderr, "%s: Error: The address mask [%s] matches more than one device.\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } else if (probe_ret == MBUS_PROBE_NOTHING) { fprintf(stderr, "%s: Error: The selected secondary address does not match any device [%s].\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } else if (probe_ret == MBUS_PROBE_ERROR) { fprintf(stderr, "%s: Error: Failed to probe secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } // else MBUS_PROBE_SINGLE if (mbus_send_request_frame(handle, 253) == -1) { fprintf(stderr, "Failed to send M-Bus request frame.\n"); - return -1; + return 1; } } else @@ -116,14 +116,14 @@ main(int argc, char **argv) if (mbus_send_request_frame(handle, address) == -1) { fprintf(stderr, "Failed to send M-Bus request frame.\n"); - return -1; + return 1; } } if (mbus_recv_frame(handle, &reply) == -1) { fprintf(stderr, "Failed to receive M-Bus response frame.\n"); - return -1; + return 1; } // diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c index 0f26830..942f673 100644 --- a/bin/mbus-serial-scan-secondary.c +++ b/bin/mbus-serial-scan-secondary.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -60,19 +60,19 @@ main(int argc, char **argv) if (strlen(addr_mask) != 16) { fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n"); - return -1; + return 1; } if ((handle = mbus_connect_serial(device)) == NULL) { fprintf(stderr, "Failed to setup connection to M-bus gateway: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_serial_set_baudrate(handle->m_serial_handle, baudrate) == -1) { printf("Failed to set baud rate.\n"); - return -1; + return 1; } mbus_scan_2nd_address_range(handle, 0, addr_mask); diff --git a/bin/mbus-serial-scan.c b/bin/mbus-serial-scan.c index 030e308..42f09f7 100644 --- a/bin/mbus-serial-scan.c +++ b/bin/mbus-serial-scan.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -45,13 +45,13 @@ main(int argc, char **argv) if ((handle = mbus_connect_serial(device)) == NULL) { printf("Failed to setup connection to M-bus gateway\n"); - return -1; + return 1; } if (mbus_serial_set_baudrate(handle->m_serial_handle, baudrate) == -1) { printf("Failed to set baud rate.\n"); - return -1; + return 1; } @@ -64,7 +64,7 @@ main(int argc, char **argv) if (mbus_send_ping_frame(handle, address) == -1) { printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_recv_frame(handle, &reply) == -1) diff --git a/bin/mbus-serial-select-secondary.c b/bin/mbus-serial-select-secondary.c index eb0650c..98536ba 100644 --- a/bin/mbus-serial-select-secondary.c +++ b/bin/mbus-serial-select-secondary.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -49,25 +49,25 @@ main(int argc, char **argv) if (strlen(addr) != 16) { printf("Misformatted secondary address. Must be 16 character HEX number.\n"); - return -1; + return 1; } if ((handle = mbus_connect_serial(device)) == NULL) { printf("Failed to setup connection to M-bus device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_serial_set_baudrate(handle->m_serial_handle, baudrate) == -1) { printf("Failed to set baud rate.\n"); - return -1; + return 1; } if (mbus_send_select_frame(handle, addr) == -1) { printf("Failed to send selection frame: %s\n", mbus_error_str()); - return -1; + return 1; } ret = mbus_recv_frame(handle, &reply); @@ -75,13 +75,13 @@ main(int argc, char **argv) if (ret == -1) { printf("No reply from device with secondary address %s: %s\n", argv[2], mbus_error_str()); - return -1; + return 1; } if (ret == -2) { printf("Invalid reply from %s: The address address probably match more than one device: %s\n", argv[2], mbus_error_str()); - return -1; + return 1; } if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) @@ -89,13 +89,13 @@ main(int argc, char **argv) if (mbus_send_request_frame(handle, 253) == -1) { printf("Failed to send request to selected secondary device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_recv_frame(handle, &reply) == -1) { printf("Failed to recieve reply from selected secondary device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_frame_type(&reply) != MBUS_FRAME_TYPE_ACK) diff --git a/bin/mbus-serial-switch-baudrate.c b/bin/mbus-serial-switch-baudrate.c index ba7c1ee..0a90f95 100644 --- a/bin/mbus-serial-switch-baudrate.c +++ b/bin/mbus-serial-switch-baudrate.c @@ -2,9 +2,9 @@ // Copyright (C) 2010-2012, Robert Johansson and contributors, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // // Contributors: // Large parts of this file was contributed by Stefan Wahren. @@ -55,19 +55,19 @@ main(int argc, char **argv) if ((handle = mbus_connect_serial(device)) == NULL) { printf("Failed to setup connection to M-bus device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_serial_set_baudrate(handle->m_serial_handle, source_baudrate) == -1) { printf("Failed to set baud rate.\n"); - return -1; + return 1; } if (mbus_send_switch_baudrate_frame(handle, address, target_baudrate) == -1) { printf("Failed to send switch baudrate frame: %s\n", mbus_error_str()); - return -1; + return 1; } ret = mbus_recv_frame(handle, &reply); @@ -75,7 +75,7 @@ main(int argc, char **argv) if (ret == -1) { printf("No reply from device\n"); - return -1; + return 1; } if (mbus_frame_type(&reply) != MBUS_FRAME_TYPE_ACK) diff --git a/bin/mbus-tcp-request-data.c b/bin/mbus-tcp-request-data.c index 83b358b..f0f93fd 100644 --- a/bin/mbus-tcp-request-data.c +++ b/bin/mbus-tcp-request-data.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -56,7 +56,7 @@ main(int argc, char **argv) if ((handle = mbus_connect_tcp(host, port)) == NULL) { fprintf(stderr, "Failed to setup connection to M-bus gateway\n"); - return -1; + return 1; } if (strlen(addr_str) == 16) @@ -70,24 +70,24 @@ main(int argc, char **argv) if (probe_ret == MBUS_PROBE_COLLISION) { fprintf(stderr, "%s: Error: The address mask [%s] matches more than one device.\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } else if (probe_ret == MBUS_PROBE_NOTHING) { fprintf(stderr, "%s: Error: The selected secondary address does not match any device [%s].\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } else if (probe_ret == MBUS_PROBE_ERROR) { fprintf(stderr, "%s: Error: Failed to probe secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str); - return -1; + return 1; } // else MBUS_PROBE_SINGLE if (mbus_send_request_frame(handle, 253) == -1) { fprintf(stderr, "Failed to send M-Bus request frame.\n"); - return -1; + return 1; } } else @@ -98,14 +98,14 @@ main(int argc, char **argv) if (mbus_send_request_frame(handle, address) == -1) { fprintf(stderr, "Failed to send M-Bus request frame.\n"); - return -1; + return 1; } } if (mbus_recv_frame(handle, &reply) == -1) { fprintf(stderr, "Failed to receive M-Bus response frame.\n"); - return -1; + return 1; } // diff --git a/bin/mbus-tcp-scan-secondary.c b/bin/mbus-tcp-scan-secondary.c index cd3eab5..ff6cb84 100644 --- a/bin/mbus-tcp-scan-secondary.c +++ b/bin/mbus-tcp-scan-secondary.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -51,13 +51,13 @@ main(int argc, char **argv) if (strlen(addr_mask) != 16) { fprintf(stderr, "Misformatted secondary address mask. Must be 16 character HEX number.\n"); - return -1; + return 1; } if ((handle = mbus_connect_tcp(host, port)) == NULL) { fprintf(stderr, "Failed to setup connection to M-bus gateway: %s\n", mbus_error_str()); - return -1; + return 1; } mbus_scan_2nd_address_range(handle, 0, addr_mask); diff --git a/bin/mbus-tcp-scan.c b/bin/mbus-tcp-scan.c index 9a5a8f8..9ae5b34 100644 --- a/bin/mbus-tcp-scan.c +++ b/bin/mbus-tcp-scan.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -40,7 +40,7 @@ main(int argc, char **argv) if ((handle = mbus_connect_tcp(host, port)) == NULL) { printf("Scan failed: Could not setup connection to M-bus gateway: %s\n", mbus_error_str()); - return -1; + return 1; } for (address = 0; address < 254; address++) @@ -50,7 +50,7 @@ main(int argc, char **argv) if (mbus_send_ping_frame(handle, address) == -1) { printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_recv_frame(handle, &reply) == -1) diff --git a/bin/mbus-tcp-select-secondary.c b/bin/mbus-tcp-select-secondary.c index a3748b4..712abe2 100644 --- a/bin/mbus-tcp-select-secondary.c +++ b/bin/mbus-tcp-select-secondary.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -42,19 +42,19 @@ main(int argc, char **argv) if (strlen(argv[3]) != 16) { printf("Misformatted secondary address. Must be 16 character HEX number.\n"); - return -1; + return 1; } if ((handle = mbus_connect_tcp(host, port)) == NULL) { printf("Failed to setup connection to M-bus gateway: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_send_select_frame(handle, addr) == -1) { printf("Failed to send selection frame: %s\n", mbus_error_str()); - return -1; + return 1; } ret = mbus_recv_frame(handle, &reply); @@ -62,13 +62,13 @@ main(int argc, char **argv) if (ret == -1) { printf("No reply from device with secondary address %s: %s\n", argv[3], mbus_error_str()); - return -1; + return 1; } if (ret == -2) { printf("Invalid reply from %s: The address address probably match more than one device: %s\n", argv[3], mbus_error_str()); - return -1; + return 1; } if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) @@ -76,13 +76,13 @@ main(int argc, char **argv) if (mbus_send_request_frame(handle, 253) == -1) { printf("Failed to send request to selected secondary device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_recv_frame(handle, &reply) == -1) { printf("Failed to recieve reply from selected secondary device: %s\n", mbus_error_str()); - return -1; + return 1; } if (mbus_frame_type(&reply) != MBUS_FRAME_TYPE_ACK) diff --git a/bin/mbus_serial_scan.c b/bin/mbus_serial_scan.c index 41f87ec..f235acd 100644 --- a/bin/mbus_serial_scan.c +++ b/bin/mbus_serial_scan.c @@ -1,3 +1,13 @@ +//------------------------------------------------------------------------------ +// Copyright (C) 2011, Robert Johansson, Raditex AB +// All rights reserved. +// +// rSCADA +// http://www.rSCADA.se +// info@rscada.se +// +//------------------------------------------------------------------------------ + #include #include diff --git a/mbus/Makefile.am b/mbus/Makefile.am index 27942e1..c6ac40e 100644 --- a/mbus/Makefile.am +++ b/mbus/Makefile.am @@ -2,9 +2,9 @@ # Copyright (C) 2010, Raditex AB # All rights reserved. # -# FreeSCADA -# http://www.FreeSCADA.com -# freescada@freescada.com +# rSCADA +# http://www.rSCADA.se +# info@rscada.se # # ------------------------------------------------------------------------------ PACKAGE = @PACKAGE@ diff --git a/mbus/Makefile.in b/mbus/Makefile.in index 6f16da1..3dca8c4 100644 --- a/mbus/Makefile.in +++ b/mbus/Makefile.in @@ -147,9 +147,9 @@ OTOOL64 = @OTOOL64@ # Copyright (C) 2010, Raditex AB # All rights reserved. # -# FreeSCADA -# http://www.FreeSCADA.com -# freescada@freescada.com +# rSCADA +# http://www.rSCADA.se +# info@rscada.se # # ------------------------------------------------------------------------------ PACKAGE = @PACKAGE@ diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c index 828effc..fa70273 100644 --- a/mbus/mbus-protocol-aux.c +++ b/mbus/mbus-protocol-aux.c @@ -2,9 +2,9 @@ // Copyright (C) 2010-2011, Robert Johansson and contributors, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // // Contributors: // Large parts of this file was contributed by Tomas Menzl. diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h index a9afcad..501bb87 100644 --- a/mbus/mbus-protocol-aux.h +++ b/mbus/mbus-protocol-aux.h @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson and contributors, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // // Contributors: // Large parts of this file was contributed by Tomas Menzl. diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c index 5176119..83edffc 100644 --- a/mbus/mbus-protocol.c +++ b/mbus/mbus-protocol.c @@ -1,11 +1,10 @@ - //------------------------------------------------------------------------------ // Copyright (C) 2010-2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h index 4b85fcf..bcc4c9e 100644 --- a/mbus/mbus-protocol.h +++ b/mbus/mbus-protocol.h @@ -2,9 +2,9 @@ // Copyright (C) 2010-2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus-serial.c b/mbus/mbus-serial.c index c62fbed..8534bb5 100644 --- a/mbus/mbus-serial.c +++ b/mbus/mbus-serial.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus-serial.h b/mbus/mbus-serial.h index 2e9a7b4..5c2999a 100644 --- a/mbus/mbus-serial.h +++ b/mbus/mbus-serial.h @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus-tcp.c b/mbus/mbus-tcp.c index 92054fd..cf594b6 100644 --- a/mbus/mbus-tcp.c +++ b/mbus/mbus-tcp.c @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -192,4 +192,3 @@ mbus_tcp_recv_frame(mbus_tcp_handle *handle, mbus_frame *frame) return 0; } - diff --git a/mbus/mbus-tcp.h b/mbus/mbus-tcp.h index a6b3929..73a8fc8 100644 --- a/mbus/mbus-tcp.h +++ b/mbus/mbus-tcp.h @@ -2,9 +2,9 @@ // Copyright (C) 2011, Robert Johansson, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus.c b/mbus/mbus.c index d12aa6e..5c57843 100644 --- a/mbus/mbus.c +++ b/mbus/mbus.c @@ -2,9 +2,9 @@ // Copyright (C) 2010, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ diff --git a/mbus/mbus.h b/mbus/mbus.h index 056f1ff..8f3efc1 100644 --- a/mbus/mbus.h +++ b/mbus/mbus.h @@ -2,9 +2,9 @@ // Copyright (C) 2010, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -26,7 +26,7 @@ * API. For examples on how to use the libmbus library, see the applications * in the bin directory in the source code distribution. * - * For more information, see http://www.freescada.com/libmbus + * For more information, see http://www.rscada.se/libmbus * */ diff --git a/test/Makefile.am b/test/Makefile.am index c8d4ebf..82c3f2a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,9 +2,9 @@ # Copyright (C) 2010, Raditex AB # All rights reserved. # -# FreeSCADA -# http://www.FreeSCADA.com -# freescada@freescada.com +# rSCADA +# http://www.rSCADA.se +# info@rscada.se # # ------------------------------------------------------------------------------ PACKAGE = @PACKAGE@ diff --git a/test/mbus_parse.c b/test/mbus_parse.c index 6681c70..4286d08 100644 --- a/test/mbus_parse.c +++ b/test/mbus_parse.c @@ -2,9 +2,9 @@ // Copyright (C) 2010, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -32,13 +32,13 @@ main(int argc, char *argv[]) if (argc != 2) { fprintf(stderr, "%s binary-file\n", argv[0]); - return -1; + return 1; } if ((fd = open(argv[1], O_RDONLY, 0)) == -1) { fprintf(stderr, "%s: failed to open '%s'", argv[0], argv[1]); - return -1; + return 1; } bzero(buf, sizeof(buf)); diff --git a/test/mbus_parse_hex.c b/test/mbus_parse_hex.c index d4f09bc..f662276 100644 --- a/test/mbus_parse_hex.c +++ b/test/mbus_parse_hex.c @@ -2,9 +2,9 @@ // Copyright (C) 2010, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------ @@ -84,7 +84,7 @@ main(int argc, char *argv[]) { mbus_frame_print(&reply); fprintf(stderr, "mbus_frame_data_parse: %s\n", mbus_error_str()); - return -1; + return 1; } //mbus_frame_print(&reply); diff --git a/test/mbus_unit_test1.c b/test/mbus_unit_test1.c index cf81ac7..aada31a 100644 --- a/test/mbus_unit_test1.c +++ b/test/mbus_unit_test1.c @@ -2,9 +2,9 @@ // Copyright (C) 2010, Raditex AB // All rights reserved. // -// FreeSCADA -// http://www.FreeSCADA.com -// freescada@freescada.com +// rSCADA +// http://www.rSCADA.se +// info@rscada.se // //------------------------------------------------------------------------------