Revert and re-apply badnull patch

Revert previous patch generated by badnull.cocci script, and apply the new one.
The main difference is that assert and assert-like functions are not touched
anymore.




SVN revision: 51650

1 files changed, 3 insertions, 3 deletions

diff --git a/src/e.c b/src/e.c
index e752fa4..6948e21 100644
--- a/src/e.c
+++ b/src/e.c
@@ -156,12 +156,12 @@ enl_ipc_send(char *str)
     unsigned short len;
     XEvent ev;
 
-    if (str == NULL) {
+    if (!str) {
         ASSERT(last_msg != NULL);
         str = last_msg;
         D_ENL(("Resending last message \"%s\" to Enlightenment.\n", str));
     } else {
-        if (last_msg != NULL) {
+        if (last_msg) {
             FREE(last_msg);
         }
         last_msg = STRDUP(str);
@@ -246,7 +246,7 @@ enl_ipc_get(const char *msg_data)
     }
     buff[12] = 0;
     blen = strlen(buff);
-    if (message != NULL) {
+    if (message) {
         len += blen;
         message = (char *) REALLOC(message, len + 1);
         strcat(message, buff);