diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-08-01 08:26:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-01 08:26:03 -0700 |
| commit | 979f54172af12d04fbcf07703b1db1891fa39d4c (patch) | |
| tree | cd8f235cab12541dd0b6ffc69c0ed231010f8c6b | |
| parent | 27c94ee2fe2e7d704dc04f47796e1b1a8531b3b2 (diff) | |
| parent | bca84afd429667bf25f2288f254f6e854bcb0f04 (diff) | |
| download | netd-979f54172af12d04fbcf07703b1db1891fa39d4c.tar.gz | |
am bca84afd: Merge "Incorrect memset parameters"
* commit 'bca84afd429667bf25f2288f254f6e854bcb0f04':
Incorrect memset parameters
| -rw-r--r-- | MDnsSdListener.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MDnsSdListener.cpp b/MDnsSdListener.cpp index 9a3f4f71..4944e180 100644 --- a/MDnsSdListener.cpp +++ b/MDnsSdListener.cpp @@ -607,8 +607,8 @@ int MDnsSdListener::Monitor::rescan() { mPollFds = (struct pollfd *)calloc(sizeof(struct pollfd), mPollSize); mPollRefs = (DNSServiceRef **)calloc(sizeof(DNSServiceRef *), mPollSize); } else { - memset(mPollFds, sizeof(struct pollfd) * mPollSize, 0); - memset(mPollRefs, sizeof(DNSServiceRef *) * mPollSize, 0); + memset(mPollFds, 0, sizeof(struct pollfd) * mPollSize); + memset(mPollRefs, 0, sizeof(DNSServiceRef *) * mPollSize); } mPollFds[0].fd = mCtrlSocketPair[0]; mPollFds[0].events = POLLIN; |