X-Git-Url: https://git.distorted.org.uk/~mdw/mLib-python/blobdiff_plain/20bce5e92b01cd928f26b61be78215117039c561..00dbd763fa9ff0986ea57146f87ac73087a1eb84:/report.pyx?ds=sidebyside

diff --git a/report.pyx b/report.pyx
index e3749b4..9d19ed2 100644
--- a/report.pyx
+++ b/report.pyx
@@ -1,48 +1,47 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Error reporting and stuff
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Error reporting and stuff
+###
+### (c) 2005 Straylight/Edgeware
+###
 
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of the Python interface to mLib.
-#
-# mLib/Python 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.
-# 
-# mLib/Python 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 mLib/Python; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-cdef extern from 'mLib/quis.h':
-  void _ego "ego"(char *prog)
-  char *_quis "quis"()
-
-cdef extern from 'mLib/report.h':
-  void _moan "moan"(char *f, char *msg)
-
-import sys
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of the Python interface to mLib.
+###
+### mLib/Python 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.
+###
+### mLib/Python 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 mLib/Python; if not, write to the Free Software Foundation,
+### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 quis = '<UNNAMED>'
-def ego(prog):
-  _ego(prog)
+cdef char *_progstring
+_progstring = NULL
+
+def ego(char *prog):
+  """ego(PROG): set program name"""
+  global quis, _progstring
+  if _progstring:
+    xfree(_progstring)
+  _progstring = xstrdup(prog)
+  _ego(_progstring)
   quis = _quis()
 
-def moan(msg):
+def moan(char *msg):
+  """moan(MSG): report a warning"""
   _moan('%s', msg)
-def die(msg, rc = 1):
+def die(char *msg, rc = 126):
+  """die(MSG, [rc = 126]): report a fatal error and exit"""
   _moan('%s', msg)
-  sys.exit(rc)
+  raise SystemExit, rc
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------