the useless commit: add copyright messages to all(?) files that need it

[ardour.git] / libs / pbd / id.cc

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index f9afa72c985a359f667e985c5666544759c5c64e..642243a36aeeee8758dc15ea5822d50615f4585d 100644 (file)
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <ostream>
 #include <iostream>
 #include <stdio.h>
@@ -8,6 +27,7 @@
 #include <inttypes.h>
 
 #include <pbd/id.h>
+#include <string>
 
 using namespace std;
 using namespace PBD;
@@ -24,7 +44,7 @@ ID::init ()
 ID::ID ()
 {
        Glib::Mutex::Lock lm (*counter_lock);
-       id = _counter++;
+       _id = _counter++;
 }
 
 ID::ID (string str)
@@ -35,14 +55,20 @@ ID::ID (string str)
 int
 ID::string_assign (string str)
 {
-       return sscanf (str.c_str(), "%" PRIu64, &id) != 0;
+       return sscanf (str.c_str(), "%" PRIu64, &_id) != 0;
 }
 
 void
-ID::print (char* buf) const
+ID::print (char* buf, uint32_t bufsize) const
+{
+       snprintf (buf, bufsize, "%" PRIu64, _id);
+}
+
+string ID::to_s() const
 {
-       /* XXX sizeof buf is unknown. bad API design */
-       snprintf (buf, 16, "%" PRIu64, id);
+    char buf[32]; // see print()
+    print(buf, sizeof (buf));
+    return string(buf);
 }
 
 ID&
@@ -53,10 +79,10 @@ ID::operator= (string str)
 }
 
 ostream&
-operator<< (ostream& ostr, const ID& id)
+operator<< (ostream& ostr, const ID& _id)
 {
        char buf[32];
-       id.print (buf);
+       _id.print (buf, sizeof (buf));
        ostr << buf;
        return ostr;
 }