| Date Of Receipt: 30-JUN-1995 18:47:35.08
From: SMURF::QUARRY::"gaf@zk3.dec.com" "30-Jun-1995 1845"
To: odehelp@zk3.dec.com, jmf@zk3.dec.com
CC:
Subj: bdiff problems.
This is a multipart MIME message.
--===_0_Fri_Jun_30_18:38:13_EDT_1995
Content-Type: text/plain; charset=us-ascii
Bdiff does not pick up the actual differences in code in the following case:
1. resb target - in this case v20supportos
2. bmerge -rPTOS lpfx.c
3. bdiff -r$NEW lpfx.c
note the bdiff below. (lpfx.bdif).
4. outdate and do a mklinks to get the original version of lpfx.c
then diff against the platinum version
lpfx.ptdif
Both of these diffs should be effectively the same. This occurred on v32 as well as on ptlite and on v20.
--===_0_Fri_Jun_30_18:38:13_EDT_1995
Content-Type: text/plain; charset=us-ascii
Content-Description: lpfx.bdif
[ ./usr/ccs/lib/cflow/lpfx.c ]
===================================================================
RCS file: ./usr/ccs/lib/cflow/lpfx.c,v
retrieving revision 4.2.6.2
diff -r4.2.6.2 ./.rcstemp027588/lpfx.c
--===_0_Fri_Jun_30_18:38:13_EDT_1995
Content-Type: text/plain; charset=us-ascii
Content-Description: lpfx.ptdif
*** lpfx.c Mon Jan 25 20:33:14 1993
--- lpfx.c.pt Tue May 30 13:01:39 1995
***************
*** 4,17 ****
/*
* HISTORY
* $Log: lpfx.c,v $
! * Revision 4.2 1991/09/20 02:41:07 devbld
! * Adding ODE Headers
*
* $EndLog$
*/
! #ifndef lint
! static char *sccsid = "@(#)$RCSfile: lpfx.c,v $ $Revision: 4.2 $ (DEC) $Date: 1991/09/20 02:41:07 $";
! #endif
/*
*/
/*
--- 4,40 ----
/*
* HISTORY
* $Log: lpfx.c,v $
! * Revision 4.2.6.2 1995/05/30 17:01:33 Gerald_Feldman
! * QAR30864. The tnames table did not correspond to the one in lint.
! * [1995/05/22 23:26:41 Gerald_Feldman]
*
+ * Revision 4.2.4.2 1994/11/29 20:22:13 Gerry_Feldman
+ * Added message number in cerror. The message number is only emitted in lint
+ * PORTING_ASSISTANT mode.
+ * [1994/11/23 21:41:55 Gerry_Feldman]
+ *
+ * Revision 4.2.2.3 1994/03/29 22:53:39 Gerry_Feldman
+ * Added #pragma ident
+ * [1994/03/24 14:41:03 Gerry_Feldman]
+ *
+ * Fixed conflict between tprint prototype in mfile1.h
+ * [1994/03/18 18:24:42 Gerry_Feldman]
+ *
+ * Revision 4.2.2.2 1994/03/29 18:46:10 Gerry_Feldman
+ * Added #pragma ident
+ * [1994/03/24 14:41:03 Gerry_Feldman]
+ *
+ * Fixed conflict between tprint prototype in mfile1.h
+ * [1994/03/18 18:24:42 Gerry_Feldman]
+ *
+ * Revision 4.2 1991/09/20 02:41:07 devbld
+ * Adding ODE Headers
+ *
* $EndLog$
*/
!
! #pragma ident "@(#)$RCSfile: lpfx.c,v $ $Revision: 4.2.6.2 $ (DEC) $Date: 1995/05/30 17:01:33 $"
!
/*
*/
/*
***************
*** 174,180 ****
break;
default:
! cerror("unknown record directive in file %s", fname);
}
}
}
--- 197,203 ----
break;
default:
! cerror(0, "unknown record directive in file %s", fname);
}
}
}
***************
*** 198,204 ****
#endif
if (markerEOF)
return ((int) CFLOWEOF);
! cerror("unexpected EOF in file %s", fname);
}
/* Handle case where delimiter indicates a new file. */
--- 221,227 ----
#endif
if (markerEOF)
return ((int) CFLOWEOF);
! cerror(0, "unexpected EOF in file %s", fname);
}
/* Handle case where delimiter indicates a new file. */
***************
*** 352,358 ****
OpenFile()
{
if ((fp = fopen(fname, "r")) == NULL) {
! cerror("can't open file %s\n", fname);
exit(1);
}
markerEOF = 0;
--- 375,381 ----
OpenFile()
{
if ((fp = fopen(fname, "r")) == NULL) {
! cerror(0, "can't open file %s\n", fname);
exit(1);
}
markerEOF = 0;
***************
*** 399,406 ****
** consistent with the ordering in pcc/m_ind/mfile1.h . The same
** function exists in m_ind/treewalk.h .
*/
! tprint(t)
! TPTR t;
{
register PPTR p;
TWORD bt;
--- 422,428 ----
** consistent with the ordering in pcc/m_ind/mfile1.h . The same
** function exists in m_ind/treewalk.h .
*/
! void tprint(TPTR t)
{
register PPTR p;
TWORD bt;
***************
*** 417,422 ****
--- 439,445 ----
"short",
"int",
"long",
+ "long long",
"float",
"double",
"long double",
***************
*** 427,432 ****
--- 450,456 ----
"unsigned short",
"unsigned",
"unsigned long"
+ "unsigned long long"
};
for( ;; t = DECREF(t) ){
--===_0_Fri_Jun_30_18:38:13_EDT_1995
Content-Type: text/plain; charset=us-ascii
+-------------------------------------------------------------+
Jerry Feldman Unix Systems - Development Engineering
Mailstop: ZKO3-3/Y25 DTN:381-2970
Digital Equipment Corp. EXT:(603)881-2970
110 Spitbrook Rd. ip(DEC): gaf@zk3.dec.com
Nashua, NH 03062-9987 enet: QUARRY::GAF
Internet(HOME):gaf@palantir.newton.ma.us
+-------------------------------------------------------------+
--===_0_Fri_Jun_30_18:38:13_EDT_1995--
|