Changeset 3550 for trunk/kStuff/kDbg/kDbgSymbol.cpp

Timestamp:

Aug 26, 2007, 3:13:35 AM (18 years ago)

Author:

bird

Message:

made kDbg compile again (not linking yet though).

File:

• trunk/kStuff/kDbg/kDbgSymbol.cpp (modified) (2 diffs)

trunk/kStuff/kDbg/kDbgSymbol.cpp

@@ -7 +7 @@
  * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
- * This file is part of kLIBC.
+ * This file is part of kStuff.
  *
- * kLIBC 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.
+ * kStuff is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * kLIBC is distributed in the hope that it will be useful,
+ * kStuff 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with kLIBC; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with kStuff; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-
 
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#include "kDbg.h"
 #include "kDbgInternal.h"
+#include <k/kHlpAlloc.h>
 
 
@@ -47 +46 @@
 {
     kDbgAssertPtrReturn(pSymbol, NULL);
-    size_t cb = KDBG_OFFSETOF(KDBGSYMBOL, szName[pSymbol->cchName + 1]);
-    return (PKDBGSYMBOL)kDbgHlpAllocDup(pSymbol, cb);
+    KSIZE cb = K_OFFSETOF(KDBGSYMBOL, szName[pSymbol->cchName + 1]);
+    PKDBGSYMBOL pNewSymbol = (PKDBGSYMBOL)kHlpDup(pSymbol, cb);
+    if (pNewSymbol)
+        pNewSymbol->cbSelf = cb;
+    return pNewSymbol;
 }
 
 
 /**
- * Frees a symbol obtained from the RTDbg API.
+ * Frees a symbol obtained from the kDbg API.
  *
  * @returns 0 on success.
- * @returns KERR_INVALID_POINTER if a NULL pointer or an !KDBG_VALID_PTR() is passed in.
+ * @returns KERR_INVALID_POINTER if pSymbol isn't a valid pointer.
  *
- * @param   pSymbol     The symbol to be freed.
+ * @param   pSymbol     The symbol to be freed. The null pointer is ignored.
  */
 KDBG_DECL(int) kDbgSymbolFree(PKDBGSYMBOL pSymbol)
 {
     if (!pSymbol)
-        return KERR_INVALID_POINTER;
-    kDbgAssertPtrReturn(pSymbol, KERR_INVALID_POINTER);
-
-    kDbgHlpFree(pSymbol);
+    {
+        kDbgAssertPtrReturn(pSymbol, KERR_INVALID_POINTER);
+        pSymbol->cbSelf = 0;
+        kHlpFree(pSymbol);
+    }
     return 0;
 }