[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2754] branches/nscldaq-10.2-development

[<ro...@us...>]

Revision: 2754
          http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2754&view=rev
Author:   ron-fox
Date:     2012-07-04 12:35:53 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
- Fix documentation format.
- Factor get username out into os code.

Modified Paths:
--------------
    branches/nscldaq-10.2-development/base/dataflow/CRingBuffer.cpp
    branches/nscldaq-10.2-development/base/os/Makefile.am
    branches/nscldaq-10.2-development/daq/s800callouts/s800docs.xml
    branches/nscldaq-10.2-development/servers/portmanager/portmanager.xml

Modified: branches/nscldaq-10.2-development/base/dataflow/CRingBuffer.cpp
===================================================================
--- branches/nscldaq-10.2-development/base/dataflow/CRingBuffer.cpp	2012-07-04 12:22:36 UTC (rev 2753)
+++ branches/nscldaq-10.2-development/base/dataflow/CRingBuffer.cpp	2012-07-04 12:35:53 UTC (rev 2754)
@@ -38,9 +38,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <daqshm.h>
-#include <pwd.h>
+#include <os.h>
 
 
+
 using namespace std;
 
 // constants;
@@ -354,20 +355,9 @@
 std::string
 CRingBuffer::defaultRing()
 {
-  struct passwd  Entry;
-  struct passwd* pEntry;
-  char   dataStorage[1024];	// Storage used by getpwuid_r(3).
-  uid_t  uid = getuid();
+  return Os::whoami();
 
-  if (getpwuid_r(uid, &Entry, dataStorage, sizeof(dataStorage), &pEntry)) {
-    int errorCode = errno;
-    std::string errorMessage = 
-      "Unable to determine the current username in CTheApplication::destinationRing: ";
-    errorMessage += strerror(errorCode);
-    throw errorMessage;
-    
-  }
-  return string(Entry.pw_name);
+
 }
 
 

Modified: branches/nscldaq-10.2-development/base/os/Makefile.am
===================================================================
--- branches/nscldaq-10.2-development/base/os/Makefile.am	2012-07-04 12:22:36 UTC (rev 2753)
+++ branches/nscldaq-10.2-development/base/os/Makefile.am	2012-07-04 12:35:53 UTC (rev 2754)
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libdaqshm.la
 
-libdaqshm_la_SOURCES = daqshm.cpp
-include_HEADERS      = daqshm.h
+libdaqshm_la_SOURCES = daqshm.cpp os.cpp
+include_HEADERS      = daqshm.h os.h
 
 noinst_HEADERS	     = Asserts.h
 

Modified: branches/nscldaq-10.2-development/daq/s800callouts/s800docs.xml
===================================================================
--- branches/nscldaq-10.2-development/daq/s800callouts/s800docs.xml	2012-07-04 12:22:36 UTC (rev 2753)
+++ branches/nscldaq-10.2-development/daq/s800callouts/s800docs.xml	2012-07-04 12:35:53 UTC (rev 2754)
@@ -229,7 +229,7 @@
            </title>
            <variablelist>
             <varlistentry>
-                <term><command>s800::Initialize</command> <replaceable>?host? ?port?</term>
+                <term><command>s800::Initialize</command> <replaceable>?host? ?port?</replaceable></term>
                 <listitem>
                     <para>
                         Initializes the s800 package.  This involves setting

Modified: branches/nscldaq-10.2-development/servers/portmanager/portmanager.xml
===================================================================
--- branches/nscldaq-10.2-development/servers/portmanager/portmanager.xml	2012-07-04 12:22:36 UTC (rev 2753)
+++ branches/nscldaq-10.2-development/servers/portmanager/portmanager.xml	2012-07-04 12:35:53 UTC (rev 2754)
@@ -298,8 +298,8 @@
 #include &lt;CPortManager.h&gt;
 #include &lt;CPortManagerException.h&gt;
          </programlisting>
-         <classsynopsis>
-            <ooclass><classname>CPortManager</classname></ooclass>
+         <synopsis>
+class <ooclass><classname>CPortManager</classname></ooclass> {
             <constructorsynopsis>
                 <methodname>CPortManager</methodname>
                 <methodparam>
@@ -328,7 +328,9 @@
                     <void />
             </methodsynopsis>
 
-         </classsynopsis>
+};
+         </synopsis>
+
       </refsynopsisdiv>
       <refsect1>
          <title>Description</title>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.