emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* lib/defines.h: Added MIN and MAX macros.

Browse Source 
* libmisc/salt.c: Removed MIN and MAX macros.
This commit is contained in:
nekral-guest 2009-04-21 22:06:09 +00:00
parent 2ba18ea4a9
commit c8f45eda53
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-20 Nicolas François <nicolas.francois@centraliens.net>
* lib/defines.h: Added MIN and MAX macros.
* libmisc/salt.c: Removed MIN and MAX macros.
2009-04-20 Sven Joachim <svenjoac@gmx.de>
* NEWS, src/lastlog.c: Fix regression causing empty reports.

8
lib/defines.h
View File

@ -348,4 +348,12 @@ extern char *strerror ();
# define unused
#endif
/* ! Arguments evaluated twice ! */
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
#endif
#endif /* _DEFINES_H_ */

4
libmisc/salt.c
View File

@ -94,10 +94,6 @@ static size_t SHA_salt_size (void)
return (size_t) (8 + rand_size);
}
/* ! Arguments evaluated twice ! */
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#define MIN(x,y) ((x) < (y) ? (x) : (y))
/* Default number of rounds if not explicitly specified. */
#define ROUNDS_DEFAULT 5000
/* Minimum number of rounds. */