X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Futil.h;h=0e9353dbd5c42056eae02da2d283480cdabdab8a;hb=87103e1fccd88e0fc8a64d774ddb620deeb90678;hp=9e7b88f06825866358adca046f55108a6163b40a;hpb=29d4af6016b5616ccac56c702c078e36189ef951;p=openvswitch diff --git a/lib/util.h b/lib/util.h index 9e7b88f0..0e9353db 100644 --- a/lib/util.h +++ b/lib/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,13 +76,11 @@ extern const char *program_name; #endif #define NOT_REACHED() abort() -#define NOT_IMPLEMENTED() abort() -#define NOT_TESTED() ((void) 0) /* XXX should print a message. */ /* Given POINTER, the address of the given MEMBER in a STRUCT object, returns the STRUCT object. */ #define CONTAINER_OF(POINTER, STRUCT, MEMBER) \ - ((STRUCT *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER))) + ((STRUCT *) (void *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER))) #ifdef __cplusplus extern "C" { @@ -125,7 +123,11 @@ bool str_to_double(const char *, double *); int hexit_value(int c); +char *get_cwd(void); char *dir_name(const char *file_name); +char *abs_file_name(const char *dir, const char *file_name); + +void ignore(bool x OVS_UNUSED); #ifdef __cplusplus }