Browse Source

Resync our strstr.c with the musl version. Removes some debug code and

optimizes one statement in two-way string compare.
OK tb@ millert@
OPENBSD_6_7
claudio 4 years ago
parent
commit
f550b55122
1 changed files with 3 additions and 11 deletions
  1. +3
    -11
      src/lib/libc/string/strstr.c

+ 3
- 11
src/lib/libc/string/strstr.c View File

@ -1,7 +1,7 @@
/* $OpenBSD: strstr.c,v 1.8 2018/04/30 07:44:56 denis Exp $ */
/* $OpenBSD: strstr.c,v 1.9 2020/04/16 12:37:52 claudio Exp $ */
/* /*
* Copyright (c) 2005-2014 Rich Felker
* Copyright (c) 2005-2018 Rich Felker
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -24,13 +24,8 @@
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef DEBUG
#include <stdio.h>
#endif
static char * static char *
twobyte_strstr(const unsigned char *h, const unsigned char *n) twobyte_strstr(const unsigned char *h, const unsigned char *n)
{ {
@ -146,11 +141,8 @@ twoway_strstr(const unsigned char *h, const unsigned char *n)
/* Check last byte first; advance by shift on mismatch */ /* Check last byte first; advance by shift on mismatch */
if (BITOP(byteset, h[l-1], &)) { if (BITOP(byteset, h[l-1], &)) {
k = l-shift[h[l-1]]; k = l-shift[h[l-1]];
#ifdef DEBUG
printf("adv by %zu (on %c) at [%s] (%zu;l=%zu)\n", k, h[l-1], h, shift[h[l-1]], l);
#endif
if (k) { if (k) {
if (mem0 && mem && k < p) k = l-p;
if (k < mem) k = mem;
h += k; h += k;
mem = 0; mem = 0;
continue; continue;


Loading…
Cancel
Save