From e445cb1025bb57a4d8353082d15b41ba13d65a1a Mon Sep 17 00:00:00 2001 From: Joe McCann Date: Tue, 21 Dec 2004 20:04:23 +0000 Subject: [PATCH] fixed diff syntax error --- net-misc/logjam/Manifest | 2 +- .../files/logjam-4.4.0-offline-sync.patch | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/net-misc/logjam/Manifest b/net-misc/logjam/Manifest index 956224346e80..2493bf85c8a5 100644 --- a/net-misc/logjam/Manifest +++ b/net-misc/logjam/Manifest @@ -8,5 +8,5 @@ MD5 2903f2d3b78e59f9ed8b9f012c5e2210 files/digest-logjam-4.2.2 64 MD5 94348f82d3a7b91d9988d1629c4bf2a8 files/digest-logjam-4.3.2 65 MD5 30945ddb58c8f3eb3780fcf9e48dbda3 files/digest-logjam-4.4.0 65 MD5 68dac613ab0e68a698fcac1864aeae45 files/logjam-4.4.0-gcc3.4.patch 241 -MD5 403b471dc638f3acfdb9ba6f5c69d440 files/logjam-4.4.0-offline-sync.patch 886 MD5 30945ddb58c8f3eb3780fcf9e48dbda3 files/digest-logjam-4.4.0-r1 65 +MD5 1a113c3728bec399a937fb09aec13464 files/logjam-4.4.0-offline-sync.patch 870 diff --git a/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch b/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch index 0961c65806c9..5d010136d36a 100644 --- a/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch +++ b/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch @@ -1,16 +1,15 @@ ---- orig/protocol/liblivejournal/livejournal/sync.c -+++ mod/protocol/liblivejournal/livejournal/sync.c +--- protocol/liblivejournal/livejournal/sync.c.old Fri Jun 18 14:57:51 2004 ++++ protocol/liblivejournal/livejournal/sync.c Fri Jun 18 14:58:20 2004 @@ -33,8 +33,10 @@ static int entry_date_compare_func(const void *a, const void *b) { - /* struct tm* cast needed to un-constify the times passed to mktime. */ -- const LJEntry *entrya = a; time_t timea = mktime((struct tm*)&entrya->time); -- const LJEntry *entryb = b; time_t timeb = mktime((struct tm*)&entryb->time); -+ const LJEntry *entrya = *(LJEntry **)a; -+ const LJEntry *entryb = *(LJEntry **)b; -+ time_t timea = mktime((struct tm*)&entrya->time); -+ time_t timeb = mktime((struct tm*)&entryb->time); - /* mktime actually converts the times to local time, which isn't - * quite correct, but since we're comparing times directly like this - * it should still sort the same way and timegm is potentially slower. */ - + /* struct tm* cast needed to un-constify the times passed to mktime. */ +- const LJEntry *entrya = a; time_t timea = mktime((struct tm*)&entrya->time); +- const LJEntry *entryb = b; time_t timeb = mktime((struct tm*)&entryb->time); ++ const LJEntry *entrya = *(LJEntry **)a; ++ const LJEntry *entryb = *(LJEntry **)b; ++ time_t timea = mktime((struct tm*)&entrya->time); ++ time_t timeb = mktime((struct tm*)&entryb->time); + /* mktime actually converts the times to local time, which isn't + * quite correct, but since we're comparing times directly like this + * it should still sort the same way and timegm is potentially slower. */ -- 2.26.2