Merge branch 'master' into develop

This commit is contained in:
Tomoaki Yamaguchi
2020-10-13 15:11:07 +09:00
committed by GitHub
3 changed files with 9 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
/************************************************************************************** /**************************************************************************************
* Copyright (c) 2016, Tomoaki Yamaguchi * Copyright (c) 2016, 2020 Tomoaki Yamaguchi and others
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0

View File

@@ -14,6 +14,7 @@
* Contributors: * Contributors:
* Benjamin Aigner - Adaption of the UDPv4 code to use UDPv6 * Benjamin Aigner - Adaption of the UDPv4 code to use UDPv6
* Tomoaki Yamaguchi - initial API and implementation and/or initial documentation * Tomoaki Yamaguchi - initial API and implementation and/or initial documentation
* Tieto Poland Sp. z o.o. - improve portability
**************************************************************************************/ **************************************************************************************/
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>

View File

@@ -1,5 +1,5 @@
/************************************************************************************** /**************************************************************************************
* Copyright (c) 2016, Tomoaki Yamaguchi * Copyright (c) 2016, 2020 Tomoaki Yamaguchi and others
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
@@ -38,13 +38,13 @@ int main(int argc, char** argv)
gateway.run(); gateway.run();
try try
{ {
gateway.initialize(argc, argv); gateway.initialize(argc, argv);
gateway.run(); gateway.run();
} }
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
WRITELOG("\nEclipse Paho MQTT-SN Gateway exception: %s\n", ex.what()); WRITELOG("\nEclipse Paho MQTT-SN Gateway exception: %s\n", ex.what());
WRITELOG("MQTT-SNGateway [-f Config file name]\n"); WRITELOG("MQTT-SNGateway [-f Config file name]\n");
} }
return 0; return 0;
} }