Attachment 163394 Details for Bug 204725 – example junk

[patch] example junk

junk.diff (text/plain), 4.68 KB, created by Jan Beich on 2015-11-21 22:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-11-21 22:25:18 UTC

Size: 4.68 KB

patch

obsolete

>Index: files/patch-bug782109
>===================================================================
>--- files/patch-bug782109	(revision 402130)
>+++ files/patch-bug782109	(working copy)
>@@ -15,6 +15,7 @@
>  #if __FreeBSD_version >= 400008
>  /*
>   * libc_r before this version of FreeBSD doesn't have poll().
>+  * libc_r before this version of FreeBSD doesn't have poll().
> --- pr/src/misc/prnetdb.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/src/misc/prnetdb.c
> @@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL;
>Index: files/patch-libtests
>===================================================================
>--- files/patch-libtests	(revision 402130)
>+++ files/patch-libtests	(working copy)
>@@ -16,6 +16,8 @@
>  
>  
>  /*
>+ */
>+ /*
> --- lib/tests/base64t.c.orig	2015-10-16 13:22:19 UTC
> +++ lib/tests/base64t.c
> @@ -1987,7 +1987,6 @@ PRBool test_008(void)
>Index: files/patch-tests
>===================================================================
>--- files/patch-tests	(revision 402130)
>+++ files/patch-tests	(working copy)
>@@ -320,6 +320,7 @@
>      printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
>      fflush(stdout);
>      sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
>+     sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
> --- pr/tests/getai.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/getai.c
> @@ -13,8 +13,13 @@ int main(int argc, char **argv)
>@@ -421,6 +422,7 @@
>      PRInt32 size;
>      PR_DEFINE_TRACE( th );
>      PRThread *t1, *t2;
>+ #include <prmem.h>
> --- pr/tests/io_timeout.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/io_timeout.c
> @@ -22,11 +22,13 @@
>@@ -490,6 +492,7 @@
>  							PR_IO_TIMEOUT_ERROR);
>  			}
>      	} else {
>+ 	printf("thread id %d, scope %s\n", info->id, scope_str);
> --- pr/tests/layer.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/layer.c
> @@ -45,7 +45,10 @@ static PRUint16 default_port = 12273;
>@@ -540,6 +543,8 @@
>      PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );
>      PRInt64 largeNumSHL5      = LL_INIT( 0x0000001f, 0xffffffe0 );        
>      PRInt64 result, result2;
>+     /*
>+ /*
> --- pr/tests/mbcs.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/mbcs.c
> @@ -54,13 +54,12 @@ char *dirName =  NULL;  /* directory nam
>@@ -671,6 +676,8 @@
>              break;
>          }
>      } while (-1 != rv);
>+     } while (-1 != rv);
>+     } while (-1 != rv);
> --- pr/tests/nonblock.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/nonblock.c
> @@ -39,7 +39,7 @@
>@@ -750,6 +757,7 @@
>  
>      printf("PASS\n");
>      return 0;
>+ {
> --- pr/tests/parsetm.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/parsetm.c
> @@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx
>@@ -1132,6 +1140,9 @@
> -
> -
> -
>+ gethost
>+ ntioto
>+ pollable
> --- pr/tests/sel_spd.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/sel_spd.c
> @@ -15,6 +15,9 @@
>@@ -1213,6 +1224,7 @@
>  
>  	fprintf(stdout, "Server results:\n\n");
>  	for (index=0; index<_threads_max*2; index+=2) {
>+ #endif
> --- pr/tests/selct_nm.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/selct_nm.c
> @@ -45,7 +45,7 @@ PRIntn debug_mode;
>@@ -1271,6 +1283,9 @@
>  
> +    return exitcode;
>  }
>+ {
>+ 			printf ("NOSTATUS\n");
>+ }
> --- pr/tests/semaerr.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/semaerr.c
> @@ -65,7 +65,7 @@ int main(int argc, char **argv)
>@@ -1340,6 +1355,8 @@
>  
>  
>  static void Measure(void (*func)(void), const char *msg)
>+     ServerScope = PR_LOCAL_THREAD;
>+ static void Measure(void (*func)(void), const char *msg)
> --- pr/tests/servr_kk.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/servr_kk.c
> @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>@@ -1367,6 +1384,8 @@
>  
>  static void do_workKK(void)
>  {
>+     ServerScope = PR_LOCAL_THREAD;
>+ {
> --- pr/tests/servr_ku.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/servr_ku.c
> @@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>@@ -2126,6 +2145,7 @@
>  #endif
>  #if defined(XP_UNIX) || defined(XP_OS2)
>          while ((opt = getopt(argc, argv, "d")) != EOF) {
>+ 
> --- pr/tests/threads.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/threads.c
> @@ -27,7 +27,7 @@ void
>@@ -2299,6 +2319,7 @@
>  }  /* main */
>  
>  /* thruput.c */
>+ /* thruput.c */
> --- pr/tests/timemac.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/tests/timemac.c
> @@ -24,7 +24,7 @@ static void printExplodedTime(const PREx
>Index: files/patch-warnings
>===================================================================
>--- files/patch-warnings	(revision 402130)
>+++ files/patch-warnings	(working copy)
>@@ -103,6 +103,7 @@
>      } else {
>          tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);
>          tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
>+         tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
> --- pr/src/pthreads/ptsynch.c.orig	2015-10-16 13:22:19 UTC
> +++ pr/src/pthreads/ptsynch.c
> @@ -30,7 +30,7 @@ static pthread_t pt_zero_tid;  /* a null

Actions: View | Diff

Attachments on bug 204725: 163394 | 163405