[Spread-cvs] commit: r476 - libspreadutil/trunk/src

[jonathan at spread.org]

Author: jonathan
Date: 2012-02-24 12:14:53 -0500 (Fri, 24 Feb 2012)
New Revision: 476

Removed:
   libspreadutil/trunk/src/errors.h
Modified:
   libspreadutil/trunk/src/memory.c
Log:
remove errors.h as it is not needed. Update memory.h to not require it

Deleted: libspreadutil/trunk/src/errors.h
===================================================================
--- libspreadutil/trunk/src/errors.h	2012-02-24 17:13:45 UTC (rev 475)
+++ libspreadutil/trunk/src/errors.h	2012-02-24 17:14:53 UTC (rev 476)
@@ -1,90 +0,0 @@
-/*
- * The Spread Toolkit.
- *     
- * The contents of this file are subject to the Spread Open-Source
- * License, Version 1.0 (the ``License''); you may not use
- * this file except in compliance with the License.  You may obtain a
- * copy of the License at:
- *
- * http://www.spread.org/license/
- *
- * or in the file ``license.txt'' found in this distribution.
- *
- * Software distributed under the License is distributed on an AS IS basis, 
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
- * for the specific language governing rights and limitations under the 
- * License.
- *
- * The Creators of Spread are:
- *  Yair Amir, Michal Miskin-Amir, Jonathan Stanton, John Schultz.
- *
- *  Copyright (C) 1993-2009 Spread Concepts LLC <info at spreadconcepts.com>
- *
- *  All Rights Reserved.
- *
- * Major Contributor(s):
- * ---------------
- *    Ryan Caudy           rcaudy at gmail.com - contributions to process groups.
- *    Claudiu Danilov      claudiu at acm.org - scalable wide area support.
- *    Cristina Nita-Rotaru crisn at cs.purdue.edu - group communication security.
- *    Theo Schlossnagle    jesus at omniti.com - Perl, autoconf, old skiplist.
- *    Dan Schoenblum       dansch at cnds.jhu.edu - Java interface.
- *
- */
-
-
-/* errors.h
- * Copyright (c) 1997 Jonathan Stanton <jonathan at cs.jhu.edu>
- * Defines all Error codes used in spread
- *
- * $Id: errors.h 432 2009-06-18 20:24:17Z jonathan $
- *
- */
-
-#ifndef ERRORS_H
-#define ERRORS_H
-
-#define OK                      1       /* All OK */
-
-#define ERR_EMPTY               -5      /* Data structure is empty */
-#define ERR_NOTFOUND            -6      /* Specified entry not found in data structure */
-#define ERR_NOMEM               -7      /* No memory available */
-
-/************************************
- * Protocol return codes
- ************************************/
-
-#define MSG_COMPLETE            2
-#define ERR_BREAK               -10
-
-/************************************ 
- * Errors for Links
- ************************************/
-#define LINK_LS_NOTPRESENT      -40
-#define LINK_FAIL               -41
-#define LINK_NOTAVAIL           -42
-#define LINK_INVALID            -43
-#define SELF_LINK               -44
-
-/************************************
- * Error codes for memory functions
- ************************************/
-#define MEM_ERR                 -51     /* Unknown error occured in memory (d)alloc check perror */
-
-/************************************
- * Object Errors
- ************************************/
-
-#define OBJ_UNKNOWN             -100    /* Object type is unknown to function */
-
-
-/************************************
- * Status Errors
- ************************************/
-
-#define ERR_STAT_INSERT_FAILURE -200    /* Insert of record failed */
-#define ERR_STAT_GROUP_FULL     -201    /* Reached maximum size of group of stat variables */
-#define ERR_STAT_GROUP_EMPTY    -202    /* Stat group empty */
-#define ERR_STAT_ILLEGAL_STATTYPE       -203    /* Not a valid datatype for a statistic */
-
-#endif /* ERRORS_H */

Modified: libspreadutil/trunk/src/memory.c
===================================================================
--- libspreadutil/trunk/src/memory.c	2012-02-24 17:13:45 UTC (rev 475)
+++ libspreadutil/trunk/src/memory.c	2012-02-24 17:14:53 UTC (rev 476)
@@ -43,7 +43,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "errors.h"
 #include "memory.h"
 #include "alarm.h"
 #include "objects.h"
@@ -425,7 +424,7 @@
 #endif
 #endif
 
-        if (mem_error) { return(MEM_ERR); }
+        if (mem_error) { return(-1); }
         return(0);
 }