diff options
| author | Olli Savia <ops@iki.fi> | 2009-06-16 07:22:00 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-06-16 07:22:00 +0000 |
| commit | e1b7cd610913f6404b5a0766e3e23311d1cb4f81 (patch) | |
| tree | 00fd28c0c03c2b36677d5d1798fbf1c83f06a1b8 | |
| parent | 4aa76fe9ee999052aba487f029faa40b9988a64e (diff) | |
| download | ATCD-e1b7cd610913f6404b5a0766e3e23311d1cb4f81.tar.gz | |
ChangeLogTag: Tue Jun 16 07:19:07 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cd208cc18cb..946908f8c86 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 16 07:19:07 UTC 2009 Olli Savia <ops@iki.fi> + + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + Added return value check for fscanf to silence complation + warning on Ubuntu 9.04. + Tue Jun 16 07:06:14 UTC 2009 Vladimir Zykov <vz@prismtech.com> * tests/Big_AMI/client.cpp: diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 699d4144c5a..75d1ae02c5d 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -416,7 +416,13 @@ ECM_Driver::parse_config_file (void) int port; if (this->skip_blanks (cfg, "reading federation port number")) return -1; - fscanf (cfg, "%d", &port); + s = fscanf (cfg, "%d", &port); + if (s == 0 || s == EOF) + { + ACE_ERROR_RETURN ((LM_ERROR, + "problem reading federation port number\n"), -1); + } + CORBA::UShort mcast_port = static_cast<CORBA::UShort> (port); int ns, nc; |