Changeset 3189


Ignore:
Timestamp:
Sep 25, 2013, 8:55:41 AM (5 years ago)
Author:
bruno
Message:
  • Again some more backports from 3.1 for memory management
Location:
branches/3.0/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mondo/src/include/my-stuff.h

    r3138 r3189  
    7777 * The location where mindi media images are stored.
    7878 */
    79 #define MINDI_CACHE "/var/cache/mindi"
     79#define MINDI_CACHE_REL "var/cache/mindi"   /* Should be coherent with mindi */
     80#define MINDI_CACHE "/"MINDI_CACHE_REL
    8081
    8182/**
     
    8889 */
    8990#define MDSTAT_FILE "/proc/mdstat"
     91
     92#ifdef __FreeBSD__
     93#define CMDLINE "/tmp/cmdline"
     94#else
     95// Default Linux
     96#define CMDLINE "/proc/cmdline"
     97#endif
    9098
    9199#undef assert
  • branches/3.0/mondo/src/lib/mr_err.c

    r1422 r3189  
    1616#include <stdio.h>
    1717#include <stdlib.h>
     18#include "mr_msg.h"
    1819
    1920/* Pointer to the right cleanup function provided by each main */
    20 extern void (*mr_cleanup)(void);
     21extern void (*mr_cleanup)(int);
    2122
    2223/*
     
    2627
    2728    if (mr_cleanup != NULL) {
    28         mr_cleanup();
     29        mr_cleanup(errorcode);
    2930    }
    3031    if (message != NULL) {
    3132        fprintf(stderr,"%s\n",message);
    3233    }
     34    mr_msg_close();
    3335    exit(errorcode);
    3436}
Note: See TracChangeset for help on using the changeset viewer.