Skip to content

Instantly share code, notes, and snippets.

@rzezeski
Created December 24, 2014 19:08
Show Gist options
  • Select an option

  • Save rzezeski/e78752e82a0da0bc372b to your computer and use it in GitHub Desktop.

Select an option

Save rzezeski/e78752e82a0da0bc372b to your computer and use it in GitHub Desktop.
wsdiff(1) output for PR#147 on illumos-core
# This file was produced by wsdiff
# 2014-12-24 at 18:41:03
Old proto area: proto.prev/
New proto area: proto/
Results file: wsdiff.out
lib/amd64/libc.so.1
NOTE: ELF .SUNW_dof difference detected.
553,554c553,554
< 0010500 3 0 9 1 . m u t e x _ l o c k _
< 31393033 74756d2e 6c5f7865 5f6b636f
---
> 0010500 4 2 4 8 . m u t e x _ l o c k _
> 38343234 74756d2e 6c5f7865 5f6b636f
559,562c559,562
< 0010560 u r s i o n \0 $ d t r a c e 3 3
< 69737275 24006e6f 61727464 33336563
< 0010600 0 9 1 . m u t e x _ r e c u r s
< 2e313930 6574756d 65725f78 73727563
---
> 0010560 u r s i o n \0 $ d t r a c e 3 4
> 69737275 24006e6f 61727464 34336563
> 0010600 2 4 8 . m u t e x _ r e c u r s
> 2e383432 6574756d 65725f78 73727563
569,570c569,570
< 0010700 c e 3 3 0 9 1 . m u t e x _ t r
< 33336563 2e313930 6574756d 72745f78
---
> 0010700 c e 3 4 2 4 8 . m u t e x _ t r
> 34336563 2e383432 6574756d 72745f78
575,578c575,578
< 0010760 t i v e \0 $ d t r a c e 3 3 0 9
< 65766974 74642400 65636172 39303333
< 0011000 1 . m u t e x _ t r y l o c k _
< 756d2e31 5f786574 6c797274 5f6b636f
---
> 0010760 t i v e \0 $ d t r a c e 3 4 2 4
> 65766974 74642400 65636172 34323433
> 0011000 8 . m u t e x _ t r y l o c k _
> 756d2e38 5f786574 6c797274 5f6b636f
585,586c585,586
< 0011100 $ d t r a c e 3 3 0 9 1 . m u t
< 72746424 33656361 31393033 74756d2e
---
> 0011100 $ d t r a c e 3 4 2 4 8 . m u t
> 72746424 33656361 38343234 74756d2e
597,598c597,598
< 0011240 l \0 $ d t r a c e 3 3 0 9 1 . m
< 6424006c 63617274 30333365 6d2e3139
---
> 0011240 l \0 $ d t r a c e 3 4 2 4 8 . m
> 6424006c 63617274 32343365 6d2e3834
611,612c611,612
< 0011420 t r a c e 3 3 0 9 1 . m u t e x
< 63617274 30333365 6d2e3139 78657475
---
> 0011420 t r a c e 3 4 2 4 8 . m u t e x
> 63617274 32343365 6d2e3834 78657475
621,624c621,624
< 0011540 i m p l \0 $ d t r a c e 3 3 0 9
< 6c706d69 74642400 65636172 39303333
< 0011560 1 . m u t e x _ l o c k _ i m p
< 756d2e31 5f786574 6b636f6c 706d695f
---
> 0011540 i m p l \0 $ d t r a c e 3 4 2 4
> 6c706d69 74642400 65636172 34323433
> 0011560 8 . m u t e x _ l o c k _ i m p
> 756d2e38 5f786574 6b636f6c 706d695f
629,632c629,632
< 0011640 r s i o n \0 $ d t r a c e 3 3 0
< 6f697372 6424006e 63617274 30333365
< 0011660 9 1 . m u t e x _ r e c u r s i
< 6d2e3139 78657475 6365725f 69737275
---
> 0011640 r s i o n \0 $ d t r a c e 3 4 2
> 6f697372 6424006e 63617274 32343365
> 0011660 4 8 . m u t e x _ r e c u r s i
> 6d2e3834 78657475 6365725f 69737275
639,640c639,640
< 0011760 e 3 3 0 9 1 . m u t e x _ t r y
< 30333365 6d2e3139 78657475 7972745f
---
> 0011760 e 3 4 2 4 8 . m u t e x _ t r y
> 32343365 6d2e3834 78657475 7972745f
645,646c645,646
< 0012040 i v e \0 $ d t r a c e 3 3 0 9 1
< 00657669 72746424 33656361 31393033
---
> 0012040 i v e \0 $ d t r a c e 3 4 2 4 8
> 00657669 72746424 33656361 38343234
655,656c655,656
< 0012160 d t r a c e 3 3 0 9 1 . m u t e
< 61727464 33336563 2e313930 6574756d
---
> 0012160 d t r a c e 3 4 2 4 8 . m u t e
> 61727464 34336563 2e383432 6574756d
675,676c675,676
... truncated due to length: use -v to override ...
lib/libc.so.1
NOTE: ELF .SUNW_dof difference detected.
547,550c547,550
< 0010420 i m p l \0 $ d t r a c e 3 4 0 7
< 6c706d69 74642400 65636172 37303433
< 0010440 9 . m u t e x _ l o c k _ i m p
< 756d2e39 5f786574 6b636f6c 706d695f
---
> 0010420 i m p l \0 $ d t r a c e 3 4 6 5
> 6c706d69 74642400 65636172 35363433
> 0010440 2 . m u t e x _ l o c k _ i m p
> 756d2e32 5f786574 6b636f6c 706d695f
567,568c567,568
< 0010660 d t r a c e 3 4 0 7 9 . m u t e
< 61727464 34336563 2e393730 6574756d
---
> 0010660 d t r a c e 3 4 6 5 2 . m u t e
> 61727464 34336563 2e323536 6574756d
573,574c573,574
< 0010740 e s s \0 $ d t r a c e 3 4 0 7 9
< 00737365 72746424 33656361 39373034
---
> 0010740 e s s \0 $ d t r a c e 3 4 6 5 2
> 00737365 72746424 33656361 32353634
581,582c581,582
< 0011040 t r a c e 3 4 0 7 9 . m u t e x
< 63617274 30343365 6d2e3937 78657475
---
> 0011040 t r a c e 3 4 6 5 2 . m u t e x
> 63617274 36343365 6d2e3235 78657475
587,588c587,588
< 0011120 n \0 $ d t r a c e 3 4 0 7 9 . m
< 6424006e 63617274 30343365 6d2e3937
---
> 0011120 n \0 $ d t r a c e 3 4 6 5 2 . m
> 6424006e 63617274 36343365 6d2e3235
599,600c599,600
< 0011260 l \0 $ d t r a c e 3 4 0 7 9 . m
< 6424006c 63617274 30343365 6d2e3937
---
> 0011260 l \0 $ d t r a c e 3 4 6 5 2 . m
> 6424006c 63617274 36343365 6d2e3235
613,614c613,614
< 0011440 t r a c e 3 4 0 7 9 . m u t e x
< 63617274 30343365 6d2e3937 78657475
---
> 0011440 t r a c e 3 4 6 5 2 . m u t e x
> 63617274 36343365 6d2e3235 78657475
623,626c623,626
< 0011560 i m p l \0 $ d t r a c e 3 4 0 7
< 6c706d69 74642400 65636172 37303433
< 0011600 9 . m u t e x _ l o c k _ i m p
< 756d2e39 5f786574 6b636f6c 706d695f
---
> 0011560 i m p l \0 $ d t r a c e 3 4 6 5
> 6c706d69 74642400 65636172 35363433
> 0011600 2 . m u t e x _ l o c k _ i m p
> 756d2e32 5f786574 6b636f6c 706d695f
637,638c637,638
< 0011740 t r a c e 3 4 0 7 9 . m u t e x
< 63617274 30343365 6d2e3937 78657475
---
> 0011740 t r a c e 3 4 6 5 2 . m u t e x
> 63617274 36343365 6d2e3235 78657475
643,644c643,644
< 0012020 s s \0 $ d t r a c e 3 4 0 7 9 .
< 24007373 61727464 34336563 2e393730
---
> 0012020 s s \0 $ d t r a c e 3 4 6 5 2 .
> 24007373 61727464 34336563 2e323536
651,652c651,652
< 0012120 r a c e 3 4 0 7 9 . m u t e x _
< 65636172 37303433 756d2e39 5f786574
---
> 0012120 r a c e 3 4 6 5 2 . m u t e x _
> 65636172 35363433 756d2e32 5f786574
657,658c657,658
< 0012200 \0 $ d t r a c e 3 4 0 7 9 . m u
< 74642400 65636172 37303433 756d2e39
---
> 0012200 \0 $ d t r a c e 3 4 6 5 2 . m u
> 74642400 65636172 35363433 756d2e32
675,676c675,676
< 0012420 a c e 3 4 0 7 9 . m u t e x _ u
< 33656361 39373034 74756d2e 755f7865
---
> 0012420 a c e 3 4 6 5 2 . m u t e x _ u
> 33656361 32353634 74756d2e 755f7865
681,682c681,682
< 0012500 \0 $ d t r a c e 3 4 0 7 9 . m u
< 74642400 65636172 37303433 756d2e39
---
> 0012500 \0 $ d t r a c e 3 4 6 5 2 . m u
> 74642400 656
... truncated due to length: use -v to override ...
usr/share/doc/ksh/shell_styleguide.html
NOTE: HTML difference detected.
1c1
< <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>[DRAFT] Bourne/Korn Shell Coding Conventions</title><meta name="generator" content="DocBook XSL Stylesheets V1.69.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="idp216260132"></a><span class="emphasis"><em>[DRAFT]</em></span> Bourne/Korn Shell Coding Conventions</h1></div><div><h3 class="subtitle"><i>
---
> <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>[DRAFT] Bourne/Korn Shell Coding Conventions</title><meta name="generator" content="DocBook XSL Stylesheets V1.69.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="idp165255188"></a><span class="emphasis"><em>[DRAFT]</em></span> Bourne/Korn Shell Coding Conventions</h1></div><div><h3 class="subtitle"><i>
215c215
< you can't do this for the <code class="literal">set</code> builtin.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="set_locale_when_comparing_against_localised_output"></a>Set the message locale if you process output of tools which may be localised</h4></div></div></div><p>Set the message locale (<code class="envar">LC_MESSAGES</code>) if you process output of tools which may be localised</p><div class="example"><a name="idp216365556"></a><p class="title"><b>Example 1. Set <code class="envar">LC_MESSAGES</code> when testing for specific outout of the <code class="filename">/usr/bin/file</code> utility:</b></p><pre class="programlisting">
---
> you can't do this for the <code class="literal">set</code> builtin.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="set_locale_when_comparing_against_localised_output"></a>Set the message locale if you process output of tools which may be localised</h4></div></div></div><p>Set the message locale (<code class="envar">LC_MESSAGES</code>) if you process output of tools which may be localised</p><div class="example"><a name="idp216370108"></a><p class="title"><b>Example 1. Set <code class="envar">LC_MESSAGES</code> when testing for specific outout of the <code class="filename">/usr/bin/file</code> utility:</b></p><pre class="programlisting">
479c479
< </p><div class="example"><a name="idp216443276"></a><p class="title"><b>Example 2. Difference between [@] and [*] when expanding arrays</b></p><pre class="programlisting">
---
> </p><div class="example"><a name="idp216445788"></a><p class="title"><b>Example 2. Difference between [@] and [*] when expanding arrays</b></p><pre class="programlisting">
567c567
< descriptor numbers interfere with the calling script.</p><div class="example"><a name="idp216472916"></a><p class="title"><b>Example 3. Open a network connection and store the file descriptor number in a variable</b></p><pre class="programlisting">
---
> descriptor numbers interfere with the calling script.</p><div class="example"><a name="idp216475292"></a><p class="title"><b>Example 3. Open a network connection and store the file descriptor number in a variable</b></p><pre class="programlisting">
607c607
< are correctly encoded.</p><div class="example"><a name="idp216482652"></a><p class="title"><b>Example 4. Print compound variable with non-printable characters</b></p><pre class="programlisting">
---
> are correctly encoded.</p><div class="example"><a name="idp216486988"></a><p class="title"><b>Example 4. Print compound variable with non-printable characters</b></p><pre class="programlisting">
631c631
< cursor+backspace+delete keys in the edit line</p><div class="example"><a name="idp216496436"></a><p class="title"><b>Example 5. Prompt user for a string with gmacs editor mode enabled</b></p><pre class="programlisting">
---
... truncated due to length: use -v to override ...
usr/lib/amd64/libzpool.so.1
NOTE: ELF .SUNW_dof difference detected.
2285,2286c2285,2286
< 0043540 r a c e 3 5 7 1 0 . z i l _ c o
< 65636172 31373533 697a2e30 6f635f6c
---
> 0043540 r a c e 3 4 1 2 3 . z i l _ c o
> 65636172 32313433 697a2e33 6f635f6c
2293,2294c2293,2294
< 0043640 c e 3 4 8 3 4 . a r c _ a c c e
< 34336563 2e343338 5f637261 65636361
---
> 0043640 c e 3 3 1 5 2 . a r c _ a c c e
> 33336563 2e323531 5f637261 65636361
2297,2298c2297,2298
< 0043700 s t \0 $ d t r a c e 3 4 8 3 4 .
< 24007473 61727464 34336563 2e343338
---
> 0043700 s t \0 $ d t r a c e 3 3 1 5 2 .
> 24007473 61727464 33336563 2e323531
2303,2304c2303,2304
< 0043760 e 3 4 8 3 4 . a r c _ e v i c t
< 38343365 612e3433 655f6372 74636976
---
> 0043760 e 3 3 1 5 2 . a r c _ e v i c t
> 31333365 612e3235 655f6372 74636976
2321,2322c2321,2322
< 0044200 d t r a c e 3 5 3 5 1 . t x g _
< 61727464 35336563 2e313533 5f677874
---
> 0044200 d t r a c e 3 3 7 6 7 . t x g _
> 61727464 33336563 2e373637 5f677874
2327,2328c2327,2328
< 0044260 d t r a c e 3 5 3 5 1 . t x g _
< 61727464 35336563 2e313533 5f677874
---
> 0044260 d t r a c e 3 3 7 6 7 . t x g _
> 61727464 33336563 2e373637 5f677874
2333,2334c2333,2334
< 0044340 5 3 5 1 . t x g _ q u i e s c e
< 31353335 6778742e 6975715f 65637365
---
> 0044340 3 7 6 7 . t x g _ q u i e s c e
> 37363733 6778742e 6975715f 65637365
2341,2342c2341,2342
< 0044440 r a c e 3 4 8 3 4 . l 2 a r c _
< 65636172 33383433 326c2e34 5f637261
---
> 0044440 r a c e 3 3 1 5 2 . l 2 a r c _
> 65636172 35313333 326c2e32 5f637261
2347,2348c2347,2348
< 0044520 d t r a c e 3 4 8 3 4 . l 2 a r
< 61727464 34336563 2e343338 7261326c
---
> 0044520 d t r a c e 3 3 1 5 2 . l 2 a r
> 61727464 33336563 2e323531 7261326c
2367,2368c2367,2368
< 0044760 a c e 3 4 9 0 7 . d m u _ t x _
< 33656361 37303934 756d642e 5f78745f
---
> 0044760 a c e 3 3 2 6 2 . d m u _ t x _
> 33656361 32363233 756d642e 5f78745f
2387,2390c2387,2390
< 0045220 _ e v i c t \0 $ d t r a c e 3 4
< 6976655f 24007463 61727464 34336563
< 0045240 8 3 4 . l 2 a r c _ e v i c t \0
< 2e343338 7261326c 76655f63 00746369
---
> 0045220 _ e v i c t \0 $ d t r a c e 3 3
> 6976655f 24007463 61727464 33336563
> 0045240 1 5 2 . l 2 a r c _ e v i c t \0
> 2e323531 7261326c 76655f63 00746369
2411,2414c2411,2414
< 0045520 a s s e s s \0 $ d t r a c e 3 5
< 65737361 24007373 61727464 35336563
< 0045540 8 9 6 . z i o _ v d e v _ i o _
< 2e363938 5f6f697a 76656476 5f6f695f
---
> 0045520 a s s e s s \0 $ d t r a c e 3 4
> 65737361 24007373 61727464 34336563
> 0045540 3 1 3 . z i o _ v d e v _ i o _
> 2e333133 5f6f697a 76656476 5f6f695f
2419,2420c2419,2420
< 0045620 5 8 9 6 . z i o _ v d e v _ i o
< 36393835 6f697a2e 6564765f 6f695f76
---
> 0045620 4 3 1 3 . z i o _ v d e v _ i o
> 33313334 6f697a2e 6564765f 6f695f76
2425,2426c2425,2426
< 0045700 5 8 9 6 . z i o _ v d e v _ i o
< 36393835 6f697a2e 6564765f 6f695f76
---
> 0045700 4 3 1 3 . z i
... truncated due to length: use -v to override ...
usr/lib/nfs/mountd
NOTE: ELF .SUNW_dof difference detected.
153,154c153,154
< 0002300 \0 $ d t r a c e 3 3 0 7 2 . e n
< 74642400 65636172 37303333 6e652e32
---
> 0002300 \0 $ d t r a c e 3 4 3 5 1 . e n
> 74642400 65636172 35333433 6e652e31
167,168c167,168
< 0002460 \0 $ d t r a c e 3 3 0 7 2 . e n
< 74642400 65636172 37303333 6e652e32
---
> 0002460 \0 $ d t r a c e 3 4 3 5 1 . e n
> 74642400 65636172 35333433 6e652e31
177,178c177,178
< 0002600 t r a c e 3 3 0 7 2 . e n q u e
< 63617274 30333365 652e3237 6575716e
---
> 0002600 t r a c e 3 4 3 5 1 . e n q u e
> 63617274 33343365 652e3135 6575716e
185,186c185,186
< 0002700 \0 $ d t r a c e 3 3 0 7 2 . m o
< 74642400 65636172 37303333 6f6d2e32
---
> 0002700 \0 $ d t r a c e 3 4 3 5 1 . m o
> 74642400 65636172 35333433 6f6d2e31
193,194c193,194
< 0003000 r a c e 3 3 0 7 2 . d o _ l o g
< 65636172 37303333 6f642e32 676f6c5f
---
> 0003000 r a c e 3 4 3 5 1 . d o _ l o g
> 65636172 35333433 6f642e31 676f6c5f
205,206c205,206
< 0003140 3 0 7 2 . m o u n t \0 n a m e _
< 32373033 756f6d2e 6e00746e 5f656d61
---
> 0003140 4 3 5 1 . m o u n t \0 n a m e _
> 31353334 756f6d2e 6e00746e 5f656d61
211,212c211,212
< 0003220 u e \0 $ d t r a c e 3 3 0 7 2 .
< 24006575 61727464 33336563 2e323730
---
> 0003220 u e \0 $ d t r a c e 3 4 3 5 1 .
> 24006575 61727464 34336563 2e313533
223,224c223,224
< 0003360 a c e 3 3 0 7 2 . m o u n t \0 n
< 33656361 32373033 756f6d2e 6e00746e
---
> 0003360 a c e 3 4 3 5 1 . m o u n t \0 n
> 33656361 31353334 756f6d2e 6e00746e
231,232c231,232
< 0003460 r a c e 3 3 0 7 2 . e n q u e u
< 65636172 37303333 6e652e32 75657571
---
> 0003460 r a c e 3 4 3 5 1 . e n q u e u
> 65636172 35333433 6e652e31 75657571
usr/lib/libc/libc_hwcap3.so.1
NOTE: ELF .SUNW_dof difference detected.
547,550c547,550
< 0010420 i m p l \0 $ d t r a c e 3 4 5 2
< 6c706d69 74642400 65636172 32353433
< 0010440 9 . m u t e x _ l o c k _ i m p
< 756d2e39 5f786574 6b636f6c 706d695f
---
> 0010420 i m p l \0 $ d t r a c e 3 5 2 0
> 6c706d69 74642400 65636172 30323533
> 0010440 1 . m u t e x _ l o c k _ i m p
> 756d2e31 5f786574 6b636f6c 706d695f
567,568c567,568
< 0010660 d t r a c e 3 4 5 2 9 . m u t e
< 61727464 34336563 2e393235 6574756d
---
> 0010660 d t r a c e 3 5 2 0 1 . m u t e
> 61727464 35336563 2e313032 6574756d
573,574c573,574
< 0010740 e s s \0 $ d t r a c e 3 4 5 2 9
< 00737365 72746424 33656361 39323534
---
> 0010740 e s s \0 $ d t r a c e 3 5 2 0 1
> 00737365 72746424 33656361 31303235
581,582c581,582
< 0011040 t r a c e 3 4 5 2 9 . m u t e x
< 63617274 35343365 6d2e3932 78657475
---
> 0011040 t r a c e 3 5 2 0 1 . m u t e x
> 63617274 32353365 6d2e3130 78657475
587,588c587,588
< 0011120 n \0 $ d t r a c e 3 4 5 2 9 . m
< 6424006e 63617274 35343365 6d2e3932
---
> 0011120 n \0 $ d t r a c e 3 5 2 0 1 . m
> 6424006e 63617274 32353365 6d2e3130
599,600c599,600
< 0011260 l \0 $ d t r a c e 3 4 5 2 9 . m
< 6424006c 63617274 35343365 6d2e3932
---
> 0011260 l \0 $ d t r a c e 3 5 2 0 1 . m
> 6424006c 63617274 32353365 6d2e3130
613,614c613,614
< 0011440 t r a c e 3 4 5 2 9 . m u t e x
< 63617274 35343365 6d2e3932 78657475
---
> 0011440 t r a c e 3 5 2 0 1 . m u t e x
> 63617274 32353365 6d2e3130 78657475
623,626c623,626
< 0011560 i m p l \0 $ d t r a c e 3 4 5 2
< 6c706d69 74642400 65636172 32353433
< 0011600 9 . m u t e x _ l o c k _ i m p
< 756d2e39 5f786574 6b636f6c 706d695f
---
> 0011560 i m p l \0 $ d t r a c e 3 5 2 0
> 6c706d69 74642400 65636172 30323533
> 0011600 1 . m u t e x _ l o c k _ i m p
> 756d2e31 5f786574 6b636f6c 706d695f
637,638c637,638
< 0011740 t r a c e 3 4 5 2 9 . m u t e x
< 63617274 35343365 6d2e3932 78657475
---
> 0011740 t r a c e 3 5 2 0 1 . m u t e x
> 63617274 32353365 6d2e3130 78657475
643,644c643,644
< 0012020 s s \0 $ d t r a c e 3 4 5 2 9 .
< 24007373 61727464 34336563 2e393235
---
> 0012020 s s \0 $ d t r a c e 3 5 2 0 1 .
> 24007373 61727464 35336563 2e313032
651,652c651,652
< 0012120 r a c e 3 4 5 2 9 . m u t e x _
< 65636172 32353433 756d2e39 5f786574
---
> 0012120 r a c e 3 5 2 0 1 . m u t e x _
> 65636172 30323533 756d2e31 5f786574
657,658c657,658
< 0012200 \0 $ d t r a c e 3 4 5 2 9 . m u
< 74642400 65636172 32353433 756d2e39
---
> 0012200 \0 $ d t r a c e 3 5 2 0 1 . m u
> 74642400 65636172 30323533 756d2e31
675,676c675,676
< 0012420 a c e 3 4 5 2 9 . m u t e x _ u
< 33656361 39323534 74756d2e 755f7865
---
> 0012420 a c e 3 5 2 0 1 . m u t e x _ u
> 33656361 31303235 74756d2e 755f7865
681,682c681,682
< 0012500 \0 $ d t r a c e 3 4 5 2 9 . m u
< 74642400 65636172 32353433 756d2e39
---
> 0012500 \0 $ d t r a c e 3 5 2 0 1 . m u
> 74642400 656
... truncated due to length: use -v to override ...
usr/lib/libc/libc_hwcap2.so.1
NOTE: ELF .SUNW_dof difference detected.
547,550c547,550
< 0010420 i m p l \0 $ d t r a c e 3 5 9 1
< 6c706d69 74642400 65636172 31393533
< 0010440 0 . m u t e x _ l o c k _ i m p
< 756d2e30 5f786574 6b636f6c 706d695f
---
> 0010420 i m p l \0 $ d t r a c e 3 2 8 1
> 6c706d69 74642400 65636172 31383233
> 0010440 9 . m u t e x _ l o c k _ i m p
> 756d2e39 5f786574 6b636f6c 706d695f
567,568c567,568
< 0010660 d t r a c e 3 5 9 1 0 . m u t e
< 61727464 35336563 2e303139 6574756d
---
> 0010660 d t r a c e 3 2 8 1 9 . m u t e
> 61727464 32336563 2e393138 6574756d
573,574c573,574
< 0010740 e s s \0 $ d t r a c e 3 5 9 1 0
< 00737365 72746424 33656361 30313935
---
> 0010740 e s s \0 $ d t r a c e 3 2 8 1 9
> 00737365 72746424 33656361 39313832
581,582c581,582
< 0011040 t r a c e 3 5 9 1 0 . m u t e x
< 63617274 39353365 6d2e3031 78657475
---
> 0011040 t r a c e 3 2 8 1 9 . m u t e x
> 63617274 38323365 6d2e3931 78657475
587,588c587,588
< 0011120 n \0 $ d t r a c e 3 5 9 1 0 . m
< 6424006e 63617274 39353365 6d2e3031
---
> 0011120 n \0 $ d t r a c e 3 2 8 1 9 . m
> 6424006e 63617274 38323365 6d2e3931
599,600c599,600
< 0011260 l \0 $ d t r a c e 3 5 9 1 0 . m
< 6424006c 63617274 39353365 6d2e3031
---
> 0011260 l \0 $ d t r a c e 3 2 8 1 9 . m
> 6424006c 63617274 38323365 6d2e3931
613,614c613,614
< 0011440 t r a c e 3 5 9 1 0 . m u t e x
< 63617274 39353365 6d2e3031 78657475
---
> 0011440 t r a c e 3 2 8 1 9 . m u t e x
> 63617274 38323365 6d2e3931 78657475
623,626c623,626
< 0011560 i m p l \0 $ d t r a c e 3 5 9 1
< 6c706d69 74642400 65636172 31393533
< 0011600 0 . m u t e x _ l o c k _ i m p
< 756d2e30 5f786574 6b636f6c 706d695f
---
> 0011560 i m p l \0 $ d t r a c e 3 2 8 1
> 6c706d69 74642400 65636172 31383233
> 0011600 9 . m u t e x _ l o c k _ i m p
> 756d2e39 5f786574 6b636f6c 706d695f
637,638c637,638
< 0011740 t r a c e 3 5 9 1 0 . m u t e x
< 63617274 39353365 6d2e3031 78657475
---
> 0011740 t r a c e 3 2 8 1 9 . m u t e x
> 63617274 38323365 6d2e3931 78657475
643,644c643,644
< 0012020 s s \0 $ d t r a c e 3 5 9 1 0 .
< 24007373 61727464 35336563 2e303139
---
> 0012020 s s \0 $ d t r a c e 3 2 8 1 9 .
> 24007373 61727464 32336563 2e393138
651,652c651,652
< 0012120 r a c e 3 5 9 1 0 . m u t e x _
< 65636172 31393533 756d2e30 5f786574
---
> 0012120 r a c e 3 2 8 1 9 . m u t e x _
> 65636172 31383233 756d2e39 5f786574
657,658c657,658
< 0012200 \0 $ d t r a c e 3 5 9 1 0 . m u
< 74642400 65636172 31393533 756d2e30
---
> 0012200 \0 $ d t r a c e 3 2 8 1 9 . m u
> 74642400 65636172 31383233 756d2e39
675,676c675,676
< 0012420 a c e 3 5 9 1 0 . m u t e x _ u
< 33656361 30313935 74756d2e 755f7865
---
> 0012420 a c e 3 2 8 1 9 . m u t e x _ u
> 33656361 39313832 74756d2e 755f7865
681,682c681,682
< 0012500 \0 $ d t r a c e 3 5 9 1 0 . m u
< 74642400 65636172 31393533 756d2e30
---
> 0012500 \0 $ d t r a c e 3 2 8 1 9 . m u
> 74642400 656
... truncated due to length: use -v to override ...
usr/lib/libc/libc_hwcap1.so.1
NOTE: ELF .SUNW_dof difference detected.
547,550c547,550
< 0010420 i m p l \0 $ d t r a c e 3 3 0 6
< 6c706d69 74642400 65636172 36303333
< 0010440 3 . m u t e x _ l o c k _ i m p
< 756d2e33 5f786574 6b636f6c 706d695f
---
> 0010420 i m p l \0 $ d t r a c e 3 3 7 5
> 6c706d69 74642400 65636172 35373333
> 0010440 2 . m u t e x _ l o c k _ i m p
> 756d2e32 5f786574 6b636f6c 706d695f
567,568c567,568
< 0010660 d t r a c e 3 3 0 6 3 . m u t e
< 61727464 33336563 2e333630 6574756d
---
> 0010660 d t r a c e 3 3 7 5 2 . m u t e
> 61727464 33336563 2e323537 6574756d
573,574c573,574
< 0010740 e s s \0 $ d t r a c e 3 3 0 6 3
< 00737365 72746424 33656361 33363033
---
> 0010740 e s s \0 $ d t r a c e 3 3 7 5 2
> 00737365 72746424 33656361 32353733
581,582c581,582
< 0011040 t r a c e 3 3 0 6 3 . m u t e x
< 63617274 30333365 6d2e3336 78657475
---
> 0011040 t r a c e 3 3 7 5 2 . m u t e x
> 63617274 37333365 6d2e3235 78657475
587,588c587,588
< 0011120 n \0 $ d t r a c e 3 3 0 6 3 . m
< 6424006e 63617274 30333365 6d2e3336
---
> 0011120 n \0 $ d t r a c e 3 3 7 5 2 . m
> 6424006e 63617274 37333365 6d2e3235
599,600c599,600
< 0011260 l \0 $ d t r a c e 3 3 0 6 3 . m
< 6424006c 63617274 30333365 6d2e3336
---
> 0011260 l \0 $ d t r a c e 3 3 7 5 2 . m
> 6424006c 63617274 37333365 6d2e3235
613,614c613,614
< 0011440 t r a c e 3 3 0 6 3 . m u t e x
< 63617274 30333365 6d2e3336 78657475
---
> 0011440 t r a c e 3 3 7 5 2 . m u t e x
> 63617274 37333365 6d2e3235 78657475
623,626c623,626
< 0011560 i m p l \0 $ d t r a c e 3 3 0 6
< 6c706d69 74642400 65636172 36303333
< 0011600 3 . m u t e x _ l o c k _ i m p
< 756d2e33 5f786574 6b636f6c 706d695f
---
> 0011560 i m p l \0 $ d t r a c e 3 3 7 5
> 6c706d69 74642400 65636172 35373333
> 0011600 2 . m u t e x _ l o c k _ i m p
> 756d2e32 5f786574 6b636f6c 706d695f
637,638c637,638
< 0011740 t r a c e 3 3 0 6 3 . m u t e x
< 63617274 30333365 6d2e3336 78657475
---
> 0011740 t r a c e 3 3 7 5 2 . m u t e x
> 63617274 37333365 6d2e3235 78657475
643,644c643,644
< 0012020 s s \0 $ d t r a c e 3 3 0 6 3 .
< 24007373 61727464 33336563 2e333630
---
> 0012020 s s \0 $ d t r a c e 3 3 7 5 2 .
> 24007373 61727464 33336563 2e323537
651,652c651,652
< 0012120 r a c e 3 3 0 6 3 . m u t e x _
< 65636172 36303333 756d2e33 5f786574
---
> 0012120 r a c e 3 3 7 5 2 . m u t e x _
> 65636172 35373333 756d2e32 5f786574
657,658c657,658
< 0012200 \0 $ d t r a c e 3 3 0 6 3 . m u
< 74642400 65636172 36303333 756d2e33
---
> 0012200 \0 $ d t r a c e 3 3 7 5 2 . m u
> 74642400 65636172 35373333 756d2e32
675,676c675,676
< 0012420 a c e 3 3 0 6 3 . m u t e x _ u
< 33656361 33363033 74756d2e 755f7865
---
> 0012420 a c e 3 3 7 5 2 . m u t e x _ u
> 33656361 32353733 74756d2e 755f7865
681,682c681,682
< 0012500 \0 $ d t r a c e 3 3 0 6 3 . m u
< 74642400 65636172 36303333 756d2e33
---
> 0012500 \0 $ d t r a c e 3 3 7 5 2 . m u
> 74642400 656
... truncated due to length: use -v to override ...
usr/lib/libzpool.so.1
NOTE: ELF .SUNW_dof difference detected.
2329,2332c2329,2332
< 0044300 i t e r \0 $ d t r a c e 3 3 9 8
< 72657469 74642400 65636172 38393333
< 0044320 9 . z i l _ c o m m i t _ w r i
< 697a2e39 6f635f6c 74696d6d 6972775f
---
> 0044300 i t e r \0 $ d t r a c e 3 6 1 7
> 72657469 74642400 65636172 37313633
> 0044320 3 . z i l _ c o m m i t _ w r i
> 697a2e33 6f635f6c 74696d6d 6972775f
2339,2340c2339,2340
< 0044420 s s \0 $ d t r a c e 3 6 4 2 9 .
< 24007373 61727464 36336563 2e393234
---
> 0044420 s s \0 $ d t r a c e 3 4 0 2 3 .
> 24007373 61727464 34336563 2e333230
2345,2346c2345,2346
< 0044500 c e 3 6 4 2 9 . a r c _ e v i c
< 36336563 2e393234 5f637261 63697665
---
> 0044500 c e 3 4 0 2 3 . a r c _ e v i c
> 34336563 2e333230 5f637261 63697665
2349,2350c2349,2350
< 0044540 t \0 $ d t r a c e 3 6 4 2 9 . a
< 64240074 63617274 34363365 612e3932
---
> 0044540 t \0 $ d t r a c e 3 4 0 2 3 . a
> 64240074 63617274 30343365 612e3332
2365,2366c2365,2366
< 0044740 e a d \0 $ d t r a c e 3 3 2 7 8
< 00646165 72746424 33656361 38373233
---
> 0044740 e a d \0 $ d t r a c e 3 5 3 2 2
> 00646165 72746424 33656361 32323335
2371,2372c2371,2372
< 0045020 e a d \0 $ d t r a c e 3 3 2 7 8
< 00646165 72746424 33656361 38373233
---
> 0045020 e a d \0 $ d t r a c e 3 5 3 2 2
> 00646165 72746424 33656361 32323335
2377,2378c2377,2378
< 0045100 $ d t r a c e 3 3 2 7 8 . t x g
< 72746424 33656361 38373233 6778742e
---
> 0045100 $ d t r a c e 3 5 3 2 2 . t x g
> 72746424 33656361 32323335 6778742e
2387,2388c2387,2388
< 0045220 c e 3 6 4 2 9 . l 2 a r c _ w r
< 36336563 2e393234 7261326c 72775f63
---
> 0045220 c e 3 4 0 2 3 . l 2 a r c _ w r
> 34336563 2e333230 7261326c 72775f63
2393,2394c2393,2394
< 0045300 r a c e 3 6 4 2 9 . l 2 a r c _
< 65636172 32343633 326c2e39 5f637261
---
> 0045300 r a c e 3 4 0 2 3 . l 2 a r c _
> 65636172 32303433 326c2e33 5f637261
2411,2412c2411,2412
< 0045520 l a y \0 $ d t r a c e 3 6 3 2 2
< 0079616c 72746424 33656361 32323336
---
> 0045520 l a y \0 $ d t r a c e 3 4 1 0 8
> 0079616c 72746424 33656361 38303134
2435,2436c2435,2436
< 0046020 6 4 2 9 . l 2 a r c _ e v i c t
< 39323436 61326c2e 655f6372 74636976
---
> 0046020 4 0 2 3 . l 2 a r c _ e v i c t
> 33323034 61326c2e 655f6372 74636976
2457,2458c2457,2458
< 0046300 t r a c e 3 4 0 7 5 . z i o _ v
< 63617274 30343365 7a2e3537 765f6f69
---
> 0046300 t r a c e 3 6 3 6 9 . z i o _ v
> 63617274 33363365 7a2e3936 765f6f69
2463,2464c2463,2464
< 0046360 a c e 3 4 0 7 5 . z i o _ d e c
< 33656361 35373034 6f697a2e 6365645f
---
> 0046360 a c e 3 6 3 6 9 . z i o _ d e c
> 33656361 39363336 6f697a2e 6365645f
2469,2470c2469,2470
< 0046440 e 3 4 0 7 5 . z i o _ d d t _ c
< 30343365 7a2e3537 645f6f69 635f7464
---
> 0046440 e 3 6 3 6 9 . z i o _ d d t _ c
> 33363365 7a2e3936 645f6f69 635f7464
2475,2476c2475,2476
< 0046520 e 3 4 0 7 5 . z i o _ v d e v _
< 30343365 7a2e3537 765f6f69 5f766564
---
> 0046520 e
... truncated due to length: use -v to override ...
usr/include/net/ppp-comp.h
NOTE: ASCII difference detected.
165,166c165,166
< #define DEFLATE_MAKE_OPT(w) ((((w) - DEFLATE_MIN_SIZE) << 4) \
< + DEFLATE_METHOD_VAL)
---
> #define DEFLATE_MAKE_OPT(w) ((((w) - DEFLATE_MIN_SIZE) << 4) + \
> DEFLATE_METHOD_VAL)
usr/include/arpa/nameser.h
NOTE: ASCII difference detected.
525,527c525
< (s) = ((uint16_t)t_cp[0] << 8) \
< | ((uint16_t)t_cp[1]) \
< ; \
---
> (s) = ((uint16_t)t_cp[0] << 8) | ((uint16_t)t_cp[1]); \
533,537c531,534
< (l) = ((uint32_t)t_cp[0] << 24) \
< | ((uint32_t)t_cp[1] << 16) \
< | ((uint32_t)t_cp[2] << 8) \
< | ((uint32_t)t_cp[3]) \
< ; \
---
> (l) = ((uint32_t)t_cp[0] << 24) | \
> ((uint32_t)t_cp[1] << 16) | \
> ((uint32_t)t_cp[2] << 8) | \
> ((uint32_t)t_cp[3]); \
usr/include/netinet/in.h
NOTE: ASCII difference detected.
1075,1076c1075,1076
< (sizeof (struct group_filter) - sizeof (struct sockaddr_storage) \
< + (numsrc) * sizeof (struct sockaddr_storage))
---
> (sizeof (struct group_filter) - sizeof (struct sockaddr_storage) + \
> (numsrc) * sizeof (struct sockaddr_storage))
1090,1091c1090,1091
< (sizeof (struct ip_msfilter) - sizeof (struct in_addr) \
< + (numsrc) * sizeof (struct in_addr))
---
> (sizeof (struct ip_msfilter) - sizeof (struct in_addr) + \
> (numsrc) * sizeof (struct in_addr))
usr/include/smbsrv/winsvc.h
NOTE: ASCII difference detected.
53,55c53,55
< #define SERVICE_DRIVER (SERVICE_KERNEL_DRIVER \
< | SERVICE_FILE_SYSTEM_DRIVER \
< | SERVICE_RECOGNIZER_DRIVER)
---
> #define SERVICE_DRIVER (SERVICE_KERNEL_DRIVER | \
> SERVICE_FILE_SYSTEM_DRIVER | \
> SERVICE_RECOGNIZER_DRIVER)
57,58c57,58
< #define SERVICE_WIN32 (SERVICE_WIN32_OWN_PROCESS \
< | SERVICE_WIN32_SHARE_PROCESS)
---
> #define SERVICE_WIN32 (SERVICE_WIN32_OWN_PROCESS | \
> SERVICE_WIN32_SHARE_PROCESS)
60,63c60,63
< #define SERVICE_TYPE_ALL (SERVICE_WIN32 \
< | SERVICE_ADAPTER \
< | SERVICE_DRIVER \
< | SERVICE_INTERACTIVE_PROCESS)
---
> #define SERVICE_TYPE_ALL (SERVICE_WIN32 | \
> SERVICE_ADAPTER | \
> SERVICE_DRIVER | \
> SERVICE_INTERACTIVE_PROCESS)
165,171c165,171
< #define SC_MANAGER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED \
< | SC_MANAGER_CONNECT \
< | SC_MANAGER_CREATE_SERVICE \
< | SC_MANAGER_ENUMERATE_SERVICE \
< | SC_MANAGER_LOCK \
< | SC_MANAGER_QUERY_LOCK_STATUS \
< | SC_MANAGER_MODIFY_BOOT_CONFIG)
---
> #define SC_MANAGER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \
> SC_MANAGER_CONNECT | \
> SC_MANAGER_CREATE_SERVICE | \
> SC_MANAGER_ENUMERATE_SERVICE | \
> SC_MANAGER_LOCK | \
> SC_MANAGER_QUERY_LOCK_STATUS | \
> SC_MANAGER_MODIFY_BOOT_CONFIG)
186,195c186,195
< #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED \
< | SERVICE_QUERY_CONFIG \
< | SERVICE_CHANGE_CONFIG \
< | SERVICE_QUERY_STATUS \
< | SERVICE_ENUMERATE_DEPENDENTS \
< | SERVICE_START \
< | SERVICE_STOP \
< | SERVICE_PAUSE_CONTINUE \
< | SERVICE_INTERROGATE \
< | SERVICE_USER_DEFINED_CONTROL)
---
> #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \
> SERVICE_QUERY_CONFIG | \
> SERVICE_CHANGE_CONFIG | \
> SERVICE_QUERY_STATUS | \
> SERVICE_ENUMERATE_DEPENDENTS | \
> SERVICE_START | \
> SERVICE_STOP | \
> SERVICE_PAUSE_CONTINUE | \
> SERVICE_INTERROGATE | \
> SERVICE_USER_DEFINED_CONTROL)
usr/include/smbsrv/ntaccess.h
NOTE: ASCII difference detected.
187,188c187
< #define SAM_LOOKUP_INFORMATION (GENERIC_EXECUTE \
< | STANDARD_RIGHTS_EXECUTE)
---
> #define SAM_LOOKUP_INFORMATION (GENERIC_EXECUTE | STANDARD_RIGHTS_EXECUTE)
usr/include/protocols/routed.h
NOTE: ASCII difference detected.
204,205c204,205
< #define NETS_LEN ((MAXPACKETSIZE - sizeof (struct rip)) \
< / sizeof (struct netinfo) +1)
---
> #define NETS_LEN ((MAXPACKETSIZE - sizeof (struct rip)) / \
> sizeof (struct netinfo) +1)
usr/include/sys/crypto/impl.h
NOTE: ASCII difference detected.
1010,1011c1010
< KCF_PROV_DUAL_CIPHER_MAC_OPS(pd)->mac_verify_decrypt_atomic \
< != NULL) ? \
---
> KCF_PROV_DUAL_CIPHER_MAC_OPS(pd)->mac_verify_decrypt_atomic != NULL) ? \
usr/include/sys/nsctl/sd_hash.h
NOTE: ASCII difference detected.
70,71c70,71
< (((cd << 6) ^ ((blk) ^ ((blk) >> table->ht_bits))) \
< & (table->ht_mask))
---
> (((cd << 6) ^ ((blk) ^ ((blk) >> table->ht_bits))) & \
> (table->ht_mask))
usr/include/sys/nsctl/sd_cache.h
NOTE: ASCII difference detected.
109,112c109,112
< #define _SD_VALID_FLAGS (NSC_RDWRBUF | NSC_NOBLOCK | NSC_WRTHRU | NSC_NOCACHE\
< | NSC_HALLOCATED | NSC_BCOPY | NSC_PAGEIO \
< | NSC_PINNABLE | NSC_MIXED | NSC_FORCED_WRTHRU \
< | NSC_METADATA)
---
> #define _SD_VALID_FLAGS (NSC_RDWRBUF | NSC_NOBLOCK | NSC_WRTHRU | \
> NSC_NOCACHE | NSC_HALLOCATED | NSC_BCOPY | NSC_PAGEIO | \
> NSC_PINNABLE | NSC_MIXED | NSC_FORCED_WRTHRU | \
> NSC_METADATA)
usr/include/sys/nsctl/sd_bcache.h
NOTE: ASCII difference detected.
781,782c781,782
< (_sd_cache_files[(cd)].cd_info->sh_alloc \
< & CD_ALLOCATED))
---
> (_sd_cache_files[(cd)].cd_info->sh_alloc & \
> CD_ALLOCATED))
827,828c827,828
< ((((cc_entry)->cc_valid) & (SDBC_GET_BITS(fba_off, fba_len))) \
< == (SDBC_GET_BITS(fba_off, fba_len)))
---
> ((((cc_entry)->cc_valid) & (SDBC_GET_BITS(fba_off, fba_len))) == \
> (SDBC_GET_BITS(fba_off, fba_len)))
usr/include/sys/nsctl/safestore.h
NOTE: ASCII difference detected.
40,41c40
< /* CSTYLED */
< /**$
---
> /*
48,49c47
< /* CSTYLED */
< /**$
---
> /*
56,57c54
< /* CSTYLED */
< /**$
---
> /*
64,65c61
< /* CSTYLED */
< /**$
---
> /*
72,73c68
< /* CSTYLED */
< /**$
---
> /*
81,82c76
< /* CSTYLED */
< /**$
---
> /*
102,103c96
< /* BEGIN CSTYLED */
< /**$
---
> /*
120d112
< /* END CSTYLED */
123,124c115
< /* CSTYLED */
< /**$
---
> /*
144,145c135
< /* CSTYLED */
< /**$
---
> /*
168,169c158
< /* CSTYLED */
< /**%
---
> /*
174,175c163
< /* CSTYLED */
< /**%
---
> /*
180,181c168
< /* CSTYLED */
< /**%
---
> /*
186,187c173
< /* CSTYLED */
< /**%
---
> /*
195,196c181
< /* CSTYLED */
< /**%
---
> /*
201,202c186
< /* CSTYLED */
< /**%
---
> /*
207,208c191
< /* CSTYLED */
< /**%
---
> /*
248,249c231
< /* CSTYLED */
< /**$
---
> /*
270,271c252
< /* BEGIN CSTYLED */
< /**$
---
> /*
323d303
< /* END CSTYLED */
usr/include/sys/fs/ufs_fs.h
NOTE: ASCII difference detected.
127,128c127,128
< #define UFS_MAXOFFSET_T ((1LL << NBBY * sizeof (daddr32_t) + DEV_BSHIFT - 1) \
< - 1)
---
> #define UFS_MAXOFFSET_T ((1LL << NBBY * \
> sizeof (daddr32_t) + DEV_BSHIFT - 1) - 1)
405,406c405,406
< (ufsvfsp)->vfs_fs->fs_postbloff) \
< + (cylno) * (ufsvfsp)->vfs_nrpos))
---
> (ufsvfsp)->vfs_fs->fs_postbloff) + \
> (cylno) * (ufsvfsp)->vfs_nrpos))
412,413c412,413
< (fs)->fs_postbloff) \
< + (cylno) * (fs)->fs_nrpos))
---
> (fs)->fs_postbloff) + \
> (cylno) * (fs)->fs_nrpos))
usr/include/sys/lvm/md_mddb.h
NOTE: ASCII difference detected.
291,292c291,292
< #define MDDB_MNLNCNT ((sizeof (mddb_mnln_t) + (MDDB_BSIZE - 1)) \
< / MDDB_BSIZE)
---
> #define MDDB_MNLNCNT ((sizeof (mddb_mnln_t) + (MDDB_BSIZE - 1)) / \
> MDDB_BSIZE)
485,486c485,486
< #define MDDB_MNLBCNT ((sizeof (mddb_mnlb_t) + (MDDB_BSIZE - 1)) \
< / MDDB_BSIZE)
---
> #define MDDB_MNLBCNT ((sizeof (mddb_mnlb_t) + (MDDB_BSIZE - 1)) / \
> MDDB_BSIZE)
usr/include/sys/usb/hubd/hub.h
NOTE: ASCII difference detected.
83,85c83,85
< #define HUB_HANDLE_PORT_FEATURE_TYPE (USB_DEV_REQ_HOST_TO_DEV \
< |USB_DEV_REQ_TYPE_CLASS \
< |USB_DEV_REQ_RCPT_OTHER)
---
> #define HUB_HANDLE_PORT_FEATURE_TYPE (USB_DEV_REQ_HOST_TO_DEV | \
> USB_DEV_REQ_TYPE_CLASS | \
> USB_DEV_REQ_RCPT_OTHER)
87,89c87,89
< #define HUB_GET_PORT_STATUS_TYPE (USB_DEV_REQ_DEV_TO_HOST \
< |USB_DEV_REQ_TYPE_CLASS \
< |USB_DEV_REQ_RCPT_OTHER)
---
> #define HUB_GET_PORT_STATUS_TYPE (USB_DEV_REQ_DEV_TO_HOST | \
> USB_DEV_REQ_TYPE_CLASS | \
> USB_DEV_REQ_RCPT_OTHER)
91,92c91,92
< #define HUB_CLASS_REQ_TYPE (USB_DEV_REQ_DEV_TO_HOST \
< |USB_DEV_REQ_TYPE_CLASS)
---
> #define HUB_CLASS_REQ_TYPE (USB_DEV_REQ_DEV_TO_HOST | \
> USB_DEV_REQ_TYPE_CLASS)
97,99c97,99
< #define HUB_GET_DEVICE_STATUS_TYPE (USB_DEV_REQ_DEV_TO_HOST \
< |USB_DEV_REQ_TYPE_STANDARD \
< |USB_DEV_REQ_RCPT_DEV)
---
> #define HUB_GET_DEVICE_STATUS_TYPE (USB_DEV_REQ_DEV_TO_HOST | \
> USB_DEV_REQ_TYPE_STANDARD | \
> USB_DEV_REQ_RCPT_DEV)
usr/include/sys/tsol/tndb.h
NOTE: ASCII difference detected.
311,312c311,312
< (((((addr) >> 16) ^ (addr)) ^ ((((addr) >> 16) ^ (addr))>> 8)) \
< % (table_size))
---
> (((((addr) >> 16) ^ (addr)) ^ ((((addr) >> 16) ^ (addr))>> 8)) % \
> (table_size))
usr/include/sys/ib/clients/ibd/ibd.h
NOTE: ASCII difference detected.
420,421c420,421
< opt = (nd_opt_hdr_t *)((uint8_t *)ip6h \
< + IPV6_HDR_LEN + sizeof (nd_neighbor_advert_t)); \
---
> opt = (nd_opt_hdr_t *)((uint8_t *)ip6h + \
> IPV6_HDR_LEN + sizeof (nd_neighbor_advert_t)); \
usr/include/sys/vgareg.h
NOTE: ASCII difference detected.
117,118c117,118
< ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VT8) \
< | ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VT9)
---
> ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VT8) | \
> ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VT9)
120,121c120,121
< ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VDE8) \
< | ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VDE9)
---
> ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VDE8) | \
> ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VDE9)
123,124c123,124
< ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VRS8) \
< | ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VRS9)
---
> ((((n)>>8)&1)<<VGA_CRTC_OVFL_REG_VRS8) | \
> ((((n)>>9)&1)<<VGA_CRTC_OVFL_REG_VRS9)
usr/include/sys/tnf_com.h
NOTE: ASCII difference detected.
140,141c140,141
< ((tnf_ref16_t)(((tnf_uint32_t)(x) >> TNF_REF32_TAG16_SHIFT) \
< & TNF_REF32_TAG16_MASK))
---
> ((tnf_ref16_t)(((tnf_uint32_t)(x) >> TNF_REF32_TAG16_SHIFT) & \
> TNF_REF32_TAG16_MASK))
usr/include/sys/sysevent_impl.h
NOTE: ASCII difference detected.
182,183c182
< #define CLASS_HASH(class_name) ((hash_func(class_name) \
< % CLASS_HASH_SZ) + 1)
---
> #define CLASS_HASH(class_name) ((hash_func(class_name) % CLASS_HASH_SZ) + 1)
usr/include/sys/stmf_defines.h
NOTE: ASCII difference detected.
89,94c89,94
< #define READ_SCSI16(addr, type) ((((type)(((uint8_t *)(addr))[0])) \
< << 8) |\
< ((type)(((uint8_t *)(addr))[1])))
< #define READ_SCSI21(addr, type) ((((type)(((uint8_t *)(addr))[0] & \
< 0x1F)) << 16)\
< | (READ_SCSI16(addr+1, type)))
---
> #define READ_SCSI16(addr, type) \
> ((((type)(((uint8_t *)(addr))[0])) << 8) | \
> ((type)(((uint8_t *)(addr))[1])))
> #define READ_SCSI21(addr, type) \
> ((((type)(((uint8_t *)(addr))[0] & 0x1F)) << 16) | \
> (READ_SCSI16(addr+1, type)))
usr/include/sys/rctl_impl.h
NOTE: ASCII difference detected.
66,67c66,67
< #define RCTLBLK_INC(blk, n) (rctlblk_t *)(((char *)blk) \
< + (n * rctlblk_size()))
---
> #define RCTLBLK_INC(blk, n) (rctlblk_t *)(((char *)blk) + \
> (n * rctlblk_size()))
usr/include/sys/queue.h
NOTE: ASCII difference detected.
297,298c297,298
< if (((elm)->field.stqe_next = (listelm)->field.stqe_next) \
< == NULL) \
---
> if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == \
> NULL) \
305,306c305,306
< if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) \
< == NULL) \
---
> if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == \
> NULL) \
usr/include/sys/port_impl.h
NOTE: ASCII difference detected.
323,327c323,327
< #define FOP_MODIFIED_MASK (FOP_FILE_WRITE|FOP_FILE_CREATE \
< |FOP_FILE_REMOVE|FOP_FILE_LINK \
< |FOP_FILE_RENAMESRC|FOP_FILE_RENAMEDST \
< |FOP_FILE_MKDIR|FOP_FILE_RMDIR \
< |FOP_FILE_SYMLINK|FOP_FILE_SETATTR_MTIME)
---
> #define FOP_MODIFIED_MASK (FOP_FILE_WRITE|FOP_FILE_CREATE | \
> FOP_FILE_REMOVE|FOP_FILE_LINK | \
> FOP_FILE_RENAMESRC|FOP_FILE_RENAMEDST | \
> FOP_FILE_MKDIR|FOP_FILE_RMDIR | \
> FOP_FILE_SYMLINK|FOP_FILE_SETATTR_MTIME)
332,333c332,333
< #define FOP_ACCESS_MASK (FOP_FILE_READ|FOP_FILE_READDIR \
< |FOP_FILE_MAP|FOP_FILE_SETATTR_ATIME)
---
> #define FOP_ACCESS_MASK (FOP_FILE_READ|FOP_FILE_READDIR | \
> FOP_FILE_MAP|FOP_FILE_SETATTR_ATIME)
338,343c338,343
< #define FOP_ATTRIB_MASK (FOP_FILE_WRITE|FOP_FILE_CREATE \
< |FOP_FILE_REMOVE|FOP_FILE_LINK \
< |FOP_FILE_RENAMESRC|FOP_FILE_RENAMEDST \
< |FOP_FILE_MKDIR|FOP_FILE_RMDIR \
< |FOP_FILE_SYMLINK|FOP_FILE_SETATTR_CTIME \
< |FOP_FILE_LINK_SRC|FOP_FILE_SETSECATTR)
---
> #define FOP_ATTRIB_MASK (FOP_FILE_WRITE|FOP_FILE_CREATE | \
> FOP_FILE_REMOVE|FOP_FILE_LINK | \
> FOP_FILE_RENAMESRC|FOP_FILE_RENAMEDST | \
> FOP_FILE_MKDIR|FOP_FILE_RMDIR | \
> FOP_FILE_SYMLINK|FOP_FILE_SETATTR_CTIME | \
> FOP_FILE_LINK_SRC|FOP_FILE_SETSECATTR)
354,355c354,355
< #define FILE_EVENTS_MASK (FILE_ACCESS|FILE_MODIFIED|FILE_ATTRIB \
< |FILE_NOFOLLOW|FILE_TRUNC)
---
> #define FILE_EVENTS_MASK (FILE_ACCESS|FILE_MODIFIED|FILE_ATTRIB| \
> FILE_NOFOLLOW|FILE_TRUNC)
usr/include/sys/swap.h
NOTE: ASCII difference detected.
193,194c193,194
< (AP)->an_vp = swapfs_getvp(((uintptr_t)(AP) >> AN_CACHE_ALIGN_LOG2) \
< & AN_VPMASK); \
---
> (AP)->an_vp = swapfs_getvp(((uintptr_t)(AP) >> AN_CACHE_ALIGN_LOG2) & \
> AN_VPMASK); \
usr/include/sys/nvpair.h
NOTE: ASCII difference detected.
119,120c119,120
< #define NVP_VALUE(nvp) ((char *)(nvp) + NV_ALIGN(sizeof (nvpair_t) \
< + (nvp)->nvp_name_sz))
---
> #define NVP_VALUE(nvp) ((char *)(nvp) + NV_ALIGN(sizeof (nvpair_t) + \
> (nvp)->nvp_name_sz))
usr/include/sys/neti.h
NOTE: ASCII difference detected.
77,78c77,78
< ((net_ispartialchecksum(n, x) & (NET_HCK_L3_FULL|NET_HCK_L4_FULL)) \
< == (NET_HCK_L3_FULL | NET_HCK_L4_FULL))
---
> ((net_ispartialchecksum(n, x) & (NET_HCK_L3_FULL|NET_HCK_L4_FULL)) == \
> (NET_HCK_L3_FULL | NET_HCK_L4_FULL))
usr/include/sys/port.h
NOTE: ASCII difference detected.
138,139c138,139
< #define FILE_EXCEPTION (UNMOUNTED|FILE_DELETE|FILE_RENAME_TO \
< |FILE_RENAME_FROM|MOUNTEDOVER)
---
> #define FILE_EXCEPTION (UNMOUNTED|FILE_DELETE|FILE_RENAME_TO| \
> FILE_RENAME_FROM|MOUNTEDOVER)
usr/include/sys/pci_impl.h
NOTE: ASCII difference detected.
75,77c75,78
< #define PCI_CADDR1(bus, device, function, reg) \
< (PCI_CONE | (((bus) & 0xff) << 16) | (((device & 0x1f)) << 11) \
< | (((function) & 0x7) << 8) | ((reg) & 0xfc))
---
> #define PCI_CADDR1(bus, device, function, reg) \
> (PCI_CONE | (((bus) & 0xff) << 16) | \
> (((device & 0x1f)) << 11) | \
> (((function) & 0x7) << 8) | ((reg) & 0xfc))
usr/include/sys/mac_flow_impl.h
NOTE: ASCII difference detected.
473,474c473,474
< ((mac_client_impl_t *)(m))->mci_misc_stat.mms_##s \
< += ((uint64_t)(c)); \
---
> ((mac_client_impl_t *)(m))->mci_misc_stat.mms_##s += \
> ((uint64_t)(c)); \
478,479c478,479
< ((mac_soft_ring_set_t *)(m))->srs_rx.sr_stat.mrs_##s \
< += ((uint64_t)(c)); \
---
> ((mac_soft_ring_set_t *)(m))->srs_rx.sr_stat.mrs_##s += \
> ((uint64_t)(c)); \
483,484c483,484
< ((mac_soft_ring_set_t *)(m))->srs_tx.st_stat.mts_##s \
< += ((uint64_t)(c)); \
---
> ((mac_soft_ring_set_t *)(m))->srs_tx.st_stat.mts_##s += \
> ((uint64_t)(c)); \
usr/include/sys/kiconv_ja.h
NOTE: ASCII difference detected.
113,114c113
< if (write_unicode((u32), &op, &oleft, errno) \
< == (size_t)-1) { \
---
> if (write_unicode((u32), &op, &oleft, errno) == (size_t)-1) { \
usr/include/sys/dklabel.h
NOTE: ASCII difference detected.
167,168c167,168
< #define LEN_DKL_PAD (DK_LABEL_SIZE \
< - ((LEN_DKL_ASCII) + \
---
> #define LEN_DKL_PAD (DK_LABEL_SIZE - \
> ((LEN_DKL_ASCII) + \
usr/include/rpc/xdr.h
NOTE: ASCII difference detected.
98,99c98,99
< #define RNDUP(x) ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
< * BYTES_PER_XDR_UNIT)
---
> #define RNDUP(x) ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) * \
> BYTES_PER_XDR_UNIT)
371,372c371,372
< *((int32_t *)(((char *)&v) + BYTES_PER_XDR_UNIT)) \
< = ntohl(*(uint32_t *)buf++); \
---
> *((int32_t *)(((char *)&v) + BYTES_PER_XDR_UNIT)) = \
> ntohl(*(uint32_t *)buf++); \
378,379c378,379
< (int32_t)htonl(*(uint32_t *)(((char *)&v) \
< + BYTES_PER_XDR_UNIT)); \
---
> (int32_t)htonl(*(uint32_t *)(((char *)&v) + \
> BYTES_PER_XDR_UNIT)); \
385,386c385,386
< BYTES_PER_XDR_UNIT)) \
< = ntohl(*(uint32_t *)buf++); \
---
> BYTES_PER_XDR_UNIT)) = \
> ntohl(*(uint32_t *)buf++); \
usr/include/inet/tcp_impl.h
NOTE: ASCII difference detected.
412,413c412,413
< (listener)->tcp_eager_next_drop_q0->tcp_eager_prev_drop_q0\
< = (eager); \
---
> (listener)->tcp_eager_next_drop_q0->tcp_eager_prev_drop_q0 = \
> (eager); \
422,425c422,425
< (eager)->tcp_eager_next_drop_q0->tcp_eager_prev_drop_q0 \
< = (eager)->tcp_eager_prev_drop_q0; \
< (eager)->tcp_eager_prev_drop_q0->tcp_eager_next_drop_q0 \
< = (eager)->tcp_eager_next_drop_q0; \
---
> (eager)->tcp_eager_next_drop_q0->tcp_eager_prev_drop_q0 = \
> (eager)->tcp_eager_prev_drop_q0; \
> (eager)->tcp_eager_prev_drop_q0->tcp_eager_next_drop_q0 = \
> (eager)->tcp_eager_next_drop_q0; \
usr/include/vm/page.h
NOTE: ASCII difference detected.
946,947c946,947
< #define PP_SETFREE(pp) ((pp)->p_state = ((pp)->p_state & ~P_MIGRATE) \
< | P_FREE)
---
> #define PP_SETFREE(pp) \
> ((pp)->p_state = ((pp)->p_state & ~P_MIGRATE) | P_FREE)
usr/include/xti.h
NOTE: ASCII difference detected.
474,475c474,475
< #define T_ALIGN(p) (((uintptr_t)(p) + (sizeof (t_scalar_t) - 1))\
< & ~(sizeof (t_scalar_t) - 1))
---
> #define T_ALIGN(p) (((uintptr_t)(p) + (sizeof (t_scalar_t) - 1)) & \
> ~(sizeof (t_scalar_t) - 1))
usr/include/thread_db.h
NOTE: ASCII difference detected.
92,93c92,93
< #define __td_eventmask(n) ((unsigned int)1 << (((n) - 1) \
< & (BT_NBIPUI - 1)))
---
> #define __td_eventmask(n) ((unsigned int)1 << (((n) - 1) & \
> (BT_NBIPUI - 1)))
usr/sbin/isns
NOTE: ELF .SUNW_dof difference detected.
195,196c195,196
< 0003020 $ d t r a c e 3 4 2 4 5 . p r o
< 72746424 33656361 35343234 6f72702e
---
> 0003020 $ d t r a c e 3 3 7 7 3 . p r o
> 72746424 33656361 33373733 6f72702e
205,206c205,206
< 0003140 o c \0 $ d t r a c e 3 4 2 4 5 .
< 2400636f 61727464 34336563 2e353432
---
> 0003140 o c \0 $ d t r a c e 3 3 7 7 3 .
> 2400636f 61727464 33336563 2e333737
215,218c215,218
< 0003260 o m _ d o c \0 $ d t r a c e 3 4
< 645f6d6f 2400636f 61727464 34336563
< 0003300 2 4 5 . p r o c e s s _ g e t A
< 2e353432 636f7270 5f737365 41746567
---
> 0003260 o m _ d o c \0 $ d t r a c e 3 3
> 645f6d6f 2400636f 61727464 33336563
> 0003300 7 7 3 . p r o c e s s _ g e t A
> 2e333737 636f7270 5f737365 41746567
227,228c227,228
< 0003420 4 2 4 5 . p r o c e s s _ g e t
< 35343234 6f72702e 73736563 7465675f
---
> 0003420 3 7 7 3 . p r o c e s s _ g e t
> 33373733 6f72702e 73736563 7465675f
235,238c235,238
< 0003520 _ d o c \0 $ d t r a c e 3 4 2 4
< 636f645f 74642400 65636172 34323433
< 0003540 5 . p r o c e s s _ e n u m e r
< 72702e35 7365636f 6e655f73 72656d75
---
> 0003520 _ d o c \0 $ d t r a c e 3 3 7 7
> 636f645f 74642400 65636172 37373333
> 0003540 3 . p r o c e s s _ e n u m e r
> 72702e33 7365636f 6e655f73 72656d75
249,250c249,250
< 0003700 $ d t r a c e 3 4 2 4 5 . p r o
< 72746424 33656361 35343234 6f72702e
---
> 0003700 $ d t r a c e 3 3 7 7 3 . p r o
> 72746424 33656361 33373733 6f72702e
257,258c257,258
< 0004000 v e r \0 $ d t r a c e 3 4 2 4 5
< 00726576 72746424 33656361 35343234
---
> 0004000 v e r \0 $ d t r a c e 3 3 7 7 3
> 00726576 72746424 33656361 33373733
265,266c265,266
< 0004100 $ d t r a c e 3 4 2 4 5 . d o o
< 72746424 33656361 35343234 6f6f642e
---
> 0004100 $ d t r a c e 3 3 7 7 3 . d o o
> 72746424 33656361 33373733 6f6f642e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment