--- np2/i386c/ia32/disasm.c	2004/07/29 13:06:08	1.8
+++ np2/i386c/ia32/disasm.c	2011/01/15 17:33:32	1.11
@@ -1,5 +1,3 @@
-/*	$Id: disasm.c,v 1.8 2004/07/29 13:06:08 monaka Exp $	*/
-
 /*
  * Copyright (c) 2004 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -641,7 +637,7 @@ ea(disasm_context_t *ctx)
  * get opcode
  */
 static int
-op(disasm_context_t *ctx)
+get_opcode(disasm_context_t *ctx)
 {
 	const char *opcode;
 	UINT8 op[3];
@@ -804,7 +800,7 @@ disasm(UINT32 *eip, disasm_context_t *ct
 	ctx->baseaddr = ctx->eip;
 	ctx->pad = ' ';
 
-	rv = op(ctx);
+	rv = get_opcode(ctx);
 	if (rv) {
 		memset(ctx, 0, sizeof(disasm_context_t));
 		return rv;