Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3515bf0f authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix implicit fallthrough warnings." 

am: 012692be

Change-Id: I37a244c2e850d1247010d92b9e91b9c34df159f1
parents 652ec069 012692be

cmds/statsd/src/hash.cpp

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


#include "hash.h"



#ifndef FALLTHROUGH_INTENDED

#define FALLTHROUGH_INTENDED [[fallthrough]]

#endif



namespace android {

namespace os {

namespace statsd {
@@ -67,8 +71,10 @@ uint32_t Hash32(const char *data, size_t n, uint32_t seed) { 
  switch (n) {

    case 3:

      h ^= ByteAs32(data[2]) << 16;

      FALLTHROUGH_INTENDED;

    case 2:

      h ^= ByteAs32(data[1]) << 8;

      FALLTHROUGH_INTENDED;

    case 1:

      h ^= ByteAs32(data[0]);

      h *= m;
@@ -104,16 +110,22 @@ uint64_t Hash64(const char* data, size_t n, uint64_t seed) { 
  switch (n) {

    case 7:

      h ^= ByteAs64(data[6]) << 48;

      FALLTHROUGH_INTENDED;

    case 6:

      h ^= ByteAs64(data[5]) << 40;

      FALLTHROUGH_INTENDED;

    case 5:

      h ^= ByteAs64(data[4]) << 32;

      FALLTHROUGH_INTENDED;

    case 4:

      h ^= ByteAs64(data[3]) << 24;

      FALLTHROUGH_INTENDED;

    case 3:

      h ^= ByteAs64(data[2]) << 16;

      FALLTHROUGH_INTENDED;

    case 2:

      h ^= ByteAs64(data[1]) << 8;

      FALLTHROUGH_INTENDED;

    case 1:

      h ^= ByteAs64(data[0]);

      h *= m;